Issue #1 - update component tags and modulefiles for nwtest lib updat…

…es, remove unneeded module load and modulefile from downstream wave job rocoto scripts
JessicaMeixner-NOAA · Oct 5, 2020 · 01e3620 · 01e3620
1 parent cd86b0e
commit 01e3620
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 116 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,7 +1,7 @@
 # External sub-modules of global-workflow
 
 [FV3GFS]
-tag = GFS.v16.0.10
+tag = GFS.v16.0.13
 local_path = sorc/fv3gfs.fd
 repo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git
@@ -15,14 +15,14 @@ protocol = git
 required = True
 
 [GLDAS]
-tag = gldas_gfsv16_release.v1.10.0
+tag = gldas_gfsv16_release.v1.11.0
 local_path = sorc/gldas.fd
 repo_url = https://github.com/NOAA-EMC/GLDAS.git
 protocol = git
 required = True
 
 [EMC_post]
-tag = upp_gfsv16_release.v1.0.16
+tag = upp_gfsv16_release.v1.1.0
 local_path = sorc/gfs_post.fd
 repo_url = https://github.com/NOAA-EMC/EMC_post.git
 protocol = git

diff --git a/jobs/rocoto/waveawipsbulls.sh b/jobs/rocoto/waveawipsbulls.sh
@@ -7,12 +7,6 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
-# Load job specific modulefile
-module use -a $HOMEgfs/modulefiles
-module load modulefile_gfswave_prdgen.wcoss_dell_p3
-status=$?
-[[ $status -ne 0 ]] && exit $status
-
 ###############################################################
 echo
 echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="

diff --git a/jobs/rocoto/waveawipsgridded.sh b/jobs/rocoto/waveawipsgridded.sh
@@ -7,12 +7,6 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
-# Load job specific modulefile
-module use -a $HOMEgfs/modulefiles
-module load modulefile_gfswave_prdgen.wcoss_dell_p3
-status=$?
-[[ $status -ne 0 ]] && exit $status
-
 ###############################################################
 echo
 echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="

diff --git a/jobs/rocoto/wavegempak.sh b/jobs/rocoto/wavegempak.sh
@@ -7,12 +7,6 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
-# Load job specific modulefile
-module use -a $HOMEgfs/modulefiles
-module load modulefile_gfswave_gempak.wcoss_dell_p3
-status=$?
-[[ $status -ne 0 ]] && exit $status
-
 ###############################################################
 echo
 echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="

diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss_dell_p3 b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.wcoss_dell_p3
@@ -5,15 +5,12 @@
 module load ips/18.0.1.163
 module load impi/18.0.1
 
-#module load NetCDF/4.5.0
-module load bacio/2.0.2
-module load w3nco/2.0.6
-module load ip/3.0.1
-module load sp/2.0.2
-
-module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
+module load bacio/2.0.3
+module load w3nco/2.2.0
+module load ip/3.0.2
+module load sp/2.0.3
 
+module load NetCDF-parallel/4.7.4
+module load HDF5-parallel/1.10.6
 
 export FC=ifort
diff --git a/modulefiles/fv3gfs/gaussian_sfcanl.wcoss_dell_p3 b/modulefiles/fv3gfs/gaussian_sfcanl.wcoss_dell_p3
@@ -8,13 +8,13 @@ set ver v15.0.0
 module load ips/18.0.1.163
 module load impi/18.0.1
 
-module load nemsio/2.2.3
-module load w3nco/2.0.6
-module load bacio/2.0.2
-module load sp/2.0.2
+module load nemsio/2.2.4
+module load w3nco/2.2.0
+module load bacio/2.0.3
+module load sp/2.0.3
 
-module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
+# Load prod modules
+module load NetCDF-parallel/4.7.4
+module load HDF5-parallel/1.10.6
 
 export FCOMP=ifort
diff --git a/modulefiles/gfs_bufr.wcoss_dell_p3 b/modulefiles/gfs_bufr.wcoss_dell_p3
@@ -14,14 +14,13 @@ module load w3nco/2.0.6
 module load bufr/11.3.0
 module load sigio/2.1.0 
 
+module load w3emc/2.4.0
+module load NetCDF-parallel/4.7.4
+module load HDF5-parallel/1.10.6
+
 module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
 module load gempak/7.3.1
 
-module use /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
-module load w3emc_para/2.4.0
-
 export myFC=mpiifort
 export myFCFLAGS="-O3 -convert big_endian -traceback -g -fp-model source -qopenmp"
 export myCPP=/lib/cpp

diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3
@@ -20,10 +20,9 @@ module load CFP/2.0.2
 setenv USE_CFP YES
 module load pm5
 
-module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
-module load hdf5_parallel/1.10.6
-module load netcdf_parallel/4.7.4
-module load esmf/8.0.1bs08
+module load NetCDF-parallel/4.7.4
+module load ESMF/8.0.1
+module load HDF5-parallel/1.10.6
 
 module use -a /gpfs/dell1/nco/ops/nwprod/modulefiles/
 module load gempak/7.3.1
@@ -36,9 +35,11 @@ module load util_shared/1.1.2
 # python
 module load python/3.6.3
 
-# Load crtm/2.3.0 from nceplibs (until installed by NCO)
-module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
+# Load crtm
 module load crtm/2.3.0
+
+# Load from nceplibs (until installed by NCO)
+module use -a /usrx/local/nceplibs/dev/NCEPLIBS/modulefiles
 module load g2tmpl/1.6.0
 
 # waveprep

diff --git a/modulefiles/modulefile_gfswave_gempak.wcoss_dell_p3 b/modulefiles/modulefile_gfswave_gempak.wcoss_dell_p3
diff --git a/modulefiles/modulefile_gfswave_prdgen.wcoss_dell_p3 b/modulefiles/modulefile_gfswave_prdgen.wcoss_dell_p3
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -26,7 +26,7 @@ if [[ ! -d fv3gfs.fd ]] ; then
     rm -f ${topdir}/checkout-fv3gfs.log
     git clone https://github.com/ufs-community/ufs-weather-model fv3gfs.fd >> ${topdir}/checkout-fv3gfs.log 2>&1
     cd fv3gfs.fd
-    git checkout  GFS.v16.0.10
+    git checkout GFS.v16.0.13
     git submodule update --init --recursive
     cd ${topdir}
 else
@@ -50,7 +50,7 @@ if [[ ! -d gldas.fd ]] ; then
     rm -f ${topdir}/checkout-gldas.log
     git clone https://github.com/NOAA-EMC/GLDAS  gldas.fd >> ${topdir}/checkout-gldas.fd.log 2>&1
     cd gldas.fd
-    git checkout gldas_gfsv16_release.v1.10.0
+    git checkout gldas_gfsv16_release.v1.11.0
     cd ${topdir}
 else
     echo 'Skip.  Directory gldas.fd already exists.'
@@ -72,7 +72,7 @@ if [[ ! -d gfs_post.fd ]] ; then
     rm -f ${topdir}/checkout-gfs_post.log
     git clone https://github.com/NOAA-EMC/EMC_post.git gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1
     cd gfs_post.fd
-    git checkout upp_gfsv16_release.v1.0.16
+    git checkout upp_gfsv16_release.v1.1.0
     ################################################################################
     # checkout_gtg
     ## yes: The gtg code at NCAR private repository is available for ops. GFS only.
@@ -83,7 +83,7 @@ if [[ ! -d gfs_post.fd ]] ; then
     if [[ ${checkout_gtg} == "YES" ]] ; then
       ./manage_externals/checkout_externals
       cp sorc/post_gtg.fd/*f90 sorc/ncep_post.fd/.
-      cp sorc/post_gtg.fd/gtg.config.gfs parm/.
+      cp sorc/post_gtg.fd/gtg.config.gfs parm/gtg.config.gfs
     fi
     cd ${topdir}
 else