update modules for wcoss2

JessicaMeixner-NOAA · Oct 5, 2023 · 408bc97 · 408bc97
1 parent 2b93041
commit 408bc97
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 35 deletions.
diff --git a/jobs/rocoto/waveinit.sh b/jobs/rocoto/waveinit.sh
@@ -16,13 +16,13 @@ source "${HOMEgfs}/ush/module-setup.sh"
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
   module load modules.ufs_model.lua
-  module load prod-util
-fi
-
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-fi
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else 
+    module load prod-util
+  fi
+fi 
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"

diff --git a/jobs/rocoto/wavepostbndpnt.sh b/jobs/rocoto/wavepostbndpnt.sh
@@ -13,16 +13,20 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 source "${HOMEgfs}/ush/detect_machine.sh"
 set +x
 source "${HOMEgfs}/ush/module-setup.sh"
+
+
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
   module load modules.ufs_model.lua
-  module load prod-util
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else
+    module load prod-util
+  fi
 fi
 
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-fi
+
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"

diff --git a/jobs/rocoto/wavepostbndpntbll.sh b/jobs/rocoto/wavepostbndpntbll.sh
@@ -13,16 +13,19 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 source "${HOMEgfs}/ush/detect_machine.sh"
 set +x
 source "${HOMEgfs}/ush/module-setup.sh"
+
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
   module load modules.ufs_model.lua
-  module load prod-util
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else
+    module load prod-util
+  fi
 fi
 
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-fi
+
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"

diff --git a/jobs/rocoto/wavepostpnt.sh b/jobs/rocoto/wavepostpnt.sh
@@ -13,16 +13,21 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 source "${HOMEgfs}/ush/detect_machine.sh"
 set +x
 source "${HOMEgfs}/ush/module-setup.sh"
+
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
   module load modules.ufs_model.lua
-  module load prod-util
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else
+    module load prod-util
+  fi
 fi
 
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-fi
+
+
+
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"

diff --git a/jobs/rocoto/wavepostsbs.sh b/jobs/rocoto/wavepostsbs.sh
@@ -15,17 +15,17 @@ set +x
 source "${HOMEgfs}/ush/module-setup.sh"
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
-  module load modules.ufs_model
-fi
-
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-else 
-  module load prod-util
+  module load modules.ufs_model.lua
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else
+    module load prod-util
+  fi
   module load wgrib2
   export WGRIB2=wgrib2
 fi
+
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"

diff --git a/jobs/rocoto/waveprep.sh b/jobs/rocoto/waveprep.sh
@@ -13,16 +13,18 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 source "${HOMEgfs}/ush/detect_machine.sh"
 set +x
 source "${HOMEgfs}/ush/module-setup.sh"
+
 if [[ "${MACHINE_ID}" != "noaacloud" ]]; then
   module use "${HOMEgfs}/sorc/ufs_model.fd/tests"
   module load modules.ufs_model.lua
-  module load prod-util
+  if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    module load prod_util
+    module load cray-pals
+  else
+    module load prod-util
+  fi
 fi
 
-if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
-  module load prod_util
-  module load cray-pals
-fi
 if [[ "${MACHINE_ID}" = "hera" ]]; then
   module use "/scratch2/NCEPDEV/ensemble/save/Walter.Kolczynski/modulefiles/core"
   module load "miniconda3/4.6.14"