diff --git a/.gitmodules b/.gitmodules index f86ee08f..076fd0c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/binli2337/fv3atm + branch = wcoss2_test [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS.git diff --git a/FV3 b/FV3 index e8fd6ee5..6b83b43c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e8fd6ee511dc18375aa1cf669813086b4db288ae +Subproject commit 6b83b43c992da774472a87deefdbcdb4a00fae46 diff --git a/modulefiles/wcoss_phase2/fv3_coupled b/modulefiles/wcoss_phase2/fv3_coupled index e075fb4b..a80e8881 100644 --- a/modulefiles/wcoss_phase2/fv3_coupled +++ b/modulefiles/wcoss_phase2/fv3_coupled @@ -11,42 +11,31 @@ module-whatis "loads NEMS FV3 prerequisites on Gyre and Tide" # NOTE: the "module purge" and loading of the module command are # handled by the module-setup.sh (or .csh) script. +module use /usrx/local/dev/modulefiles +module load cmake/3.6.2 -module use /usrx/local/dev/modulefiles/ - -## -## load programming environment -## this typically includes compiler, MPI and job scheduler -## -module load ics/16.0.3 -module load ibmpe +module use /usrx/local/modulefiles +module load ips/18.0.1.163 module load NetCDF +module load lsf +module load python/2.7.14 -# Build scripts want static linking, but the /usr version of libz is -# only dynamic. We'll use the nwprod version instead. -module load z - -# Execution requirements -module load lsf - -# WW3 grib +module use -a /nwprod2/lib/modulefiles module load jasper/v1.900.1 module load png/v1.2.44 module load z/v1.2.6 -module load crtm/v2.2.4 -module use -a /nceplibs/NCEPLIBS/modulefiles -module load g2/3.1.1 -## -### load nceplibs libraries -### +module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles module load bacio/2.0.3 module load ip/3.0.2 module load sp/2.0.3 module load w3nco/2.0.7 -module load w3emc/2.3.1 +module load w3emc/2.4.0 module load nemsio/2.2.4 +module load g2tmpl/1.6.0 +module load crtm/2.3.0 +module load g2/3.1.1 #ESMF lib module use /nems/noscrub/emc.nemspara/soft/modulefiles -module load esmf/8.0.0 +module load esmf/8.0.0_intel18