Squashed commit of the following:

commit dd5ec6e Author: Shelley Melchior <[email protected]> Date: Thu Jun 9 17:01:24 2022 +0000 Added export before definition of envir. commit 5609b1c Author: AshleyStanfield-NOAA <[email protected]> Date: Wed Jun 8 21:52:00 2022 -0400 Obsproc 'Module Load' order modifications (#39) * Modified order of modules, specifically bufr-dump and prepobs. * More shifts and changes. * More adjustements, shifted added lines slightly, fixed bugs. * Added in module unload phases. commit 21d7d9a Author: Shelley Melchior <[email protected]> Date: Thu Jun 2 13:30:52 2022 +0000 Squashed commit of the following: commit daff5af Author: Shelley Melchior <[email protected]> Date: Fri May 27 18:05:05 2022 +0000 Added section to cd to logfile output dir prior to process submission. commit 30c01f9 Author: iliana Genkova <[email protected]> Date: Tue May 24 11:37:06 2022 -0500 Set obsproc_ver=v1.0 and HOMEgfs=$COMROOT/gfs/v16.2 (#38) * Set obsproc+ver=v1.0 and HOMEgfs=$COMROOT/gfs/v16.2 * Introduce 3-digit obsproc_ver_pckg and use with $PACKAGEROOT commit ebb6c68 Author: Cory Martin <[email protected]> Date: Tue Apr 12 15:15:47 2022 -0400 Changes needed to build on Hera (#32) commit 0075564 Author: Shelley Melchior <[email protected]> Date: Sat Apr 9 17:07:10 2022 -0400 Incorporating changes made by NCO SPA following: (#35) restart of cactus and changing output data directory for mods commit 59596a9 Author: Shelley Melchior <[email protected]> Date: Thu Apr 7 21:27:40 2022 +0000 Removing top level README.md. This file now resides in docs/. commit 735f009 Merge: bd4211a 8f28c00 Author: Iliana Genkova <[email protected]> Date: Thu Apr 7 20:51:34 2022 +0000 Merge branch 'release/obsproc.v1.0.0' into develop commit 8f28c00 Merge: f01f691 bd4211a Author: Iliana Genkova <[email protected]> Date: Thu Apr 7 20:49:01 2022 +0000 Removed build.sh (now in /build-obsproc) and ush/prepobs_makeprepbufr.sh(now in module prepobs) Merge branch 'develop' into release/obsproc.v1.0.0 commit bd4211a Author: iliana Genkova <[email protected]> Date: Mon Jan 3 19:23:04 2022 -0600 Adopt Jack Woolen's (CFS) faster prepobs_makeprepbufr.sh: (#19) * Adopt Jack Woolen's (CFS) faster prepobs_makeprepbufr.sh: -use cfp with mpiexe -introduce FORT5 -move ksh interpreter * Clean up interpreter commit 309371d Author: Shelley Melchior <[email protected]> Date: Mon Jan 3 18:25:21 2022 -0500 created README.md Created README.md to better explain installation instructions, modified to adopt NCO's working practices. commit c5342eb Author: Rahul Mahajan <[email protected]> Date: Mon Jan 3 17:57:29 2022 -0500 adopt for current NCO working practices per discussion w/ StevenEarle et al (#18) commit e63a78c Author: Shelley Melchior <[email protected]> Date: Wed Jun 1 16:21:51 2022 +0000 Updated to correctly locate tcvitals file. commit 0bbb542 Author: Shelley Melchior <[email protected]> Date: Fri Apr 8 20:31:15 2022 +0000 Incorporating changes made by NCO SPA following: restart of cactus and changing output data directory for mods
NOAA-EMC · Jun 9, 2022 · 625bf97 · 625bf97
1 parent cbc15ed
commit 625bf97
Show file tree

Hide file tree

Showing 30 changed files with 162 additions and 73 deletions.
diff --git a/triggers/jairnow_dump.wc2.pbs b/triggers/jairnow_dump.wc2.pbs
@@ -52,12 +52,15 @@ fi
 # Load the modules specified in $VERSION_FILE
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
 
 # Be sure the modules are loaded
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jcdas_dump.wc2.pbs b/triggers/jcdas_dump.wc2.pbs
@@ -57,8 +57,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jcdas_dump_post.wc2.pbs b/triggers/jcdas_dump_post.wc2.pbs
@@ -58,8 +58,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jcdas_prep1.wc2.pbs b/triggers/jcdas_prep1.wc2.pbs
@@ -51,15 +51,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jcdas_prep1_post.wc2.pbs b/triggers/jcdas_prep1_post.wc2.pbs
@@ -50,15 +50,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jcdas_prep2.wc2.pbs b/triggers/jcdas_prep2.wc2.pbs
@@ -55,15 +55,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jcdas_prep2_post.wc2.pbs b/triggers/jcdas_prep2_post.wc2.pbs
@@ -51,15 +51,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jdump_monitor.wc2.pbs b/triggers/jdump_monitor.wc2.pbs
@@ -55,8 +55,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jglobal_dump.wc2.pbs b/triggers/jglobal_dump.wc2.pbs
@@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jglobal_dump_post.wc2.pbs b/triggers/jglobal_dump_post.wc2.pbs
@@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jglobal_prep.wc2.pbs b/triggers/jglobal_prep.wc2.pbs
@@ -50,15 +50,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jglobal_prep_post.wc2.pbs b/triggers/jglobal_prep_post.wc2.pbs
@@ -50,15 +50,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jmods.wc2.pbs b/triggers/jmods.wc2.pbs
@@ -54,8 +54,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jnam_dump.wc2.pbs b/triggers/jnam_dump.wc2.pbs
@@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jnam_dump2.wc2.pbs b/triggers/jnam_dump2.wc2.pbs
@@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jnam_dump_post.wc2.pbs b/triggers/jnam_dump_post.wc2.pbs
@@ -59,8 +59,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jnam_prep.wc2.pbs b/triggers/jnam_prep.wc2.pbs
@@ -55,15 +55,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jnam_prep_post.wc2.pbs b/triggers/jnam_prep_post.wc2.pbs
@@ -52,15 +52,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jrap_dump.wc2.pbs b/triggers/jrap_dump.wc2.pbs
@@ -65,8 +65,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jrap_dump_post.wc2.pbs b/triggers/jrap_dump_post.wc2.pbs
@@ -67,8 +67,10 @@ module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
 # use para installation
-module unload bufr_dump
 #module use /apps/ops/para/nco/modulefiles/compiler/intel/19.1.3.304 
+# use local bufr_dump installation
+module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
 module use ${userROOT}/install/bufr-dump-rel.1.0.0/modulefiles
 module load bufr_dump/${bufr_dump_ver}
 

diff --git a/triggers/jrap_prep.wc2.pbs b/triggers/jrap_prep.wc2.pbs
@@ -58,15 +58,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi

diff --git a/triggers/jrap_prep_post.wc2.pbs b/triggers/jrap_prep_post.wc2.pbs
@@ -56,15 +56,19 @@ fi
 #Load the modules
 module load grib_util/${grib_util_ver}
 module load netcdf/${netcdf_ver}
-module load bufr_dump/${bufr_dump_ver}
-# use local prepobs installation
-#module use ${userROOT}/install/prepobs/modulefiles
-module load prepobs/${prepobs_ver}
 module load intel/${intel_ver}
 module load craype/${craype_ver}
 module load cray-mpich/${cray_mpich_ver}
 module load cray-pals/${cray_pals_ver}
 module load cfp/${cfp_ver}
+# use local bufr_dump installation
+#module unload bufr_dump
+#module use ${userROOT}/install/bufr_dump/modulefiles
+module load bufr_dump/${bufr_dump_ver}
+# use local prepobs installation
+#module unload prepobs
+#module use ${userROOT}/install/prepobs/modulefiles
+module load prepobs/${prepobs_ver}
 
 #Check if they exist
 if [[ $(echo $LOADEDMODULES | egrep -c "(^|:)grib_util/") -eq 0 ]]; then echo "grib_util is not loaded!"; fi