Merge branch 'develop' into feature/gwdev_issue_2451.001

NOAA-EMC · Jun 5, 2024 · 9b290b2 · 9b290b2
2 parents 665dbb8 + 205d0c2
commit 9b290b2
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
@@ -21,5 +21,4 @@ skip_ci_on_hosts:
   - hera
   - orion
   - hercules
-  - wcoss2
 
diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh
@@ -74,7 +74,7 @@ set +e
 source "${HOMEgfs}/ush/module-setup.sh"
 export BUILD_JOBS=8
 rm -rf log.build
-./build_all.sh -gk  >> log.build 2>&1
+./build_all.sh -guk  >> log.build 2>&1
 build_status=$?
 
 DATE=$(date +'%D %r')

diff --git a/docs/source/hpc.rst b/docs/source/hpc.rst
@@ -22,7 +22,7 @@ HPC helpdesks
 * Hercules:  [email protected]
 * HPSS: [email protected]
 * Gaea: [email protected]
-* S4: david.huber@noaa.gov
+* S4: innocent.souopgui@noaa.gov
 * Jet: [email protected]
 * Cloud: [email protected]
 
@@ -48,7 +48,7 @@ https://aim.rdhpcs.noaa.gov/
 Optimizing the global workflow on S4
 ====================================
 
-The S4 cluster is relatively small and so optimizations are recommended to improve cycled runtimes. Please contact David Huber (david.huber@noaa.gov) if you are planning on running a cycled experiment on this system to obtain optimized configuration files.
+The S4 cluster is relatively small and so optimizations are recommended to improve cycled runtimes. Please contact Innocent Souopgui (innocent.souopgui@noaa.gov) if you are planning on running a cycled experiment on this system to obtain optimized configuration files.
 
 ============
 Git settings

diff --git a/docs/source/init.rst b/docs/source/init.rst
@@ -315,7 +315,7 @@ Manual Generation
 *****************
 
 .. note::
-   Initial conditions cannot be generated on S4. These must be generated on another supported platform then pushed to S4. If you do not have access to a supported system or need assistance, please contact David Huber (david.huber@noaa.gov).
+   Initial conditions cannot be generated on S4. These must be generated on another supported platform then pushed to S4. If you do not have access to a supported system or need assistance, please contact Innocent Souopgui (innocent.souopgui@noaa.gov).
 
 .. _coldstarts:
 

diff --git a/sorc/build_all.sh b/sorc/build_all.sh
@@ -145,7 +145,7 @@ build_opts["ww3prepost"]="${_wave_opt} ${_verbose_opt} ${_build_ufs_opt} ${_buil
 
 # Optional DA builds
 if [[ "${_build_ufsda}" == "YES" ]]; then
-   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" ]]; then
+   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" && "${MACHINE_ID}" != "wcoss2" ]]; then
       echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}.  Disabling build."
    else
       build_jobs["gdas"]=8

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
diff --git a/sorc/jcb b/sorc/jcb
diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh
@@ -34,13 +34,13 @@ source "${HOMEgfs}/ush/module-setup.sh"
 module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
 
 case "${MACHINE_ID}" in
-  ("hera" | "orion" | "hercules")
+  ("hera" | "orion" | "hercules" | "wcoss2")
     module load "${MODS}/${MACHINE_ID}"
     ncdump=$( command -v ncdump )
     NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
     export NETCDF
     ;;
-  ("wcoss2" | "acorn" | "jet" | "gaea" | "s4")
+  ("jet" | "gaea" | "s4" | "acorn")
     echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
     ;;  
   *)