forked from ufs-community/ufs-weather-model
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ufs-community#105 from climbfuji/update_gsl_develo…
…p_from_develop_20211019 Update gsl/develop from develop 2021/10/19
- Loading branch information
Showing
241 changed files
with
11,100 additions
and
13,264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule CDEPS
updated
24 files
+110 −29 | cime_config/stream_cdeps.py | |
+29 −29 | cime_config/streams.xsd | |
+4 −13 | datm/atm_comp_nuopc.F90 | |
+24 −22 | datm/cime_config/buildnml | |
+2 −2 | datm/cime_config/stream_definition_datm.xml | |
+23 −0 | datm/cime_config/user_nl_datm_streams | |
+26 −20 | dice/cime_config/buildnml | |
+23 −0 | dice/cime_config/user_nl_dice_streams | |
+2 −10 | dice/ice_comp_nuopc.F90 | |
+25 −25 | dlnd/cime_config/buildnml | |
+23 −0 | dlnd/cime_config/user_nl_dlnd_streams | |
+5 −7 | dlnd/lnd_comp_nuopc.F90 | |
+24 −23 | docn/cime_config/buildnml | |
+23 −0 | docn/cime_config/user_nl_docn_streams | |
+3 −12 | docn/ocn_comp_nuopc.F90 | |
+25 −22 | drof/cime_config/buildnml | |
+23 −0 | drof/cime_config/user_nl_drof_streams | |
+3 −11 | drof/rof_comp_nuopc.F90 | |
+97 −3 | dshr/dshr_mod.F90 | |
+25 −23 | dwav/cime_config/buildnml | |
+23 −0 | dwav/cime_config/user_nl_dwav_streams | |
+4 −7 | dwav/wav_comp_nuopc.F90 | |
+49 −1 | streams/dshr_strdata_mod.F90 | |
+83 −33 | streams/dshr_stream_mod.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule CMakeModules
updated
2 files
+57 −27 | Modules/FindESMF.cmake | |
+1 −1 | Modules/FindNetCDF.cmake |
Submodule DATM
deleted from
1e9ab6
Submodule FV3
updated
22 files
+8 −2 | .gitignore | |
+9 −9 | .gitmodules | |
+11 −100 | CMakeLists.txt | |
+1 −1 | atmos_cubed_sphere | |
+15 −14 | atmos_model.F90 | |
+14 −1 | ccpp/CMakeLists.txt | |
+57 −499 | ccpp/data/GFS_typedefs.F90 | |
+50 −73 | ccpp/data/GFS_typedefs.meta | |
+17 −15 | ccpp/driver/GFS_diagnostics.F90 | |
+1 −1 | ccpp/framework | |
+1 −1 | ccpp/physics | |
+0 −88 | ccpp/suites/suite_FV3_GFS_2017_coupled.xml | |
+0 −90 | ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml | |
+0 −88 | ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml | |
+0 −93 | ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml | |
+5 −6 | ccpp/suites/suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml | |
+35 −0 | cpl/module_block_data.F90 | |
+53 −20 | fv3_cap.F90 | |
+107 −86 | io/FV3GFS_io.F90 | |
+1 −0 | io/module_fv3_io_def.F90 | |
+3 −4 | io/module_wrt_grid_comp.F90 | |
+40 −69 | stochastic_physics/stochastic_physics_wrapper.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule MOM6
updated
7 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE) | ||
set(AVX2 OFF CACHE BOOL "Enable AVX2 instruction set" FORCE) | ||
set(AVX ON CACHE BOOL "Enable AVX2 instruction set" FORCE) | ||
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE) | ||
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE) | ||
set(DEBUG_LINKMPI OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE) | ||
set(AVX2 OFF CACHE BOOL "Enable AVX2 instruction set" FORCE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,20 @@ | ||
#%Module###################################################################### | ||
## | ||
## NEMS FV3 Prerequisites: S4 | ||
#%Module | ||
|
||
proc ModulesHelp {} { | ||
puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on S4" | ||
puts stderr "\tcit - loads modules required for building and running UFS Model on S4" | ||
} | ||
|
||
module-whatis "loads NEMS FV3 prerequisites for S4" | ||
module-whatis "loads UFS Model prerequisites for S4" | ||
|
||
# NOTE: the "module purge" and loading of the module command are | ||
# handled by the module-setup.sh (or .csh) script. | ||
|
||
## | ||
## load programming environment | ||
## this typically includes compiler, MPI and job scheduler | ||
## | ||
module load license_intel/S4 | ||
module load intel/18.0.3 | ||
module load hdf/4.2.14 | ||
module load hdf5/1.8.21 | ||
module load netcdf4/4.6.2 | ||
module use /data/prod/hpc-stack/modulefiles/stack | ||
module load hpc/1.1.0 | ||
module load hpc-intel/18.0.4 | ||
module load hpc-impi/18.0.4 | ||
|
||
## | ||
## load nwprod libraries | ||
## | ||
module use -a /data/prod/ncep_libs/intel/18.0.3/modulefiles | ||
module load bacio/v2.0.2 | ||
module load sp/v2.0.2 | ||
module load ip/v3.0.0 | ||
module load w3nco/v2.0.6 | ||
module load w3emc/v2.3.0 | ||
module load nemsio/v2.2.3 | ||
module load g2/v3.1.0 | ||
module load g2tmpl/v1.5.0 | ||
module load crtm/v2.3.0 | ||
module load jasper/v1.900.1 | ||
module load png/v1.2.44 | ||
module load z/v1.2.6 | ||
module load ufs_common | ||
|
||
module load esmf/v8.0.0 | ||
setenv CC mpiicc | ||
setenv CXX mpiicpc | ||
setenv FC mpiifort | ||
setenv CMAKE_Platform s4.intel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#%Module | ||
|
||
proc ModulesHelp {} { | ||
puts stderr "\tcit - loads modules required for building and running UFS Model on S4" | ||
} | ||
|
||
module-whatis "loads UFS Model prerequisites for S4" | ||
|
||
|
||
module load license_intel/S4 | ||
module use /data/prod/hpc-stack/modulefiles/stack | ||
module load hpc/1.1.0 | ||
module load hpc-intel/18.0.4 | ||
module load hpc-impi/18.0.4 | ||
|
||
module load ufs_common_debug | ||
|
||
setenv CC mpiicc | ||
setenv CXX mpiicpc | ||
setenv FC mpiifort | ||
setenv CMAKE_Platform s4.intel |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule stochastic_physics
updated
from 11dfba to 57fa71
Oops, something went wrong.