Update g-w to cycle with C1152 ATM (#3206)

There are a few updates needed to cycle with the C1152 atmospheric model: - config.resources(.$machine): include C1152 case options for DA tasks - gdasfcst config.ufs: WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=20 - source code update for calc_analysis NOAA-EMC/GSI-utils#59 - resource change needed for atmanl upp Note that any needed changes to time limits for C1152 will be addressed at a later date. Resolves #3173
NOAA-EMC · Jan 10, 2025 · ed95546 · ed95546
1 parent bb029b5
commit ed95546
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 22 deletions.
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -324,7 +324,7 @@ case ${step} in
   "snowanl")
     # below lines are for creating JEDI YAML
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         layout_x=6
         layout_y=6
         ;;
@@ -353,7 +353,7 @@ case ${step} in
   "esnowanl")
     # below lines are for creating JEDI YAML
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         layout_x=6
         layout_y=6
         ;;
@@ -390,7 +390,7 @@ case ${step} in
   "aeroanlinit")
     # below lines are for creating JEDI YAML
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         layout_x=8
         layout_y=8
         ;;
@@ -423,7 +423,7 @@ case ${step} in
 
   "aeroanlvar")
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         layout_x=8
         layout_y=8
         ;;
@@ -457,7 +457,7 @@ case ${step} in
 
   "aeroanlgenb")
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         layout_x=8
         layout_y=8
         ;;
@@ -668,7 +668,7 @@ case ${step} in
     walltime_gdas="01:20:00"
     walltime_gfs="01:00:00"
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         ntasks_gdas=780
         ntasks_gfs=825
         threads_per_task=5
@@ -704,7 +704,7 @@ case ${step} in
     export threads_per_task_echgres_gfs=12
     export is_exclusive=True
     memory="48GB"
-    if [[ "${CASE}" == "C384" || "${CASE}" == "C768" ]]; then
+    if [[ "${CASE}" == "C384" || "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
        memory="${mem_node_max}"
     fi
     ;;
@@ -897,7 +897,7 @@ case ${step} in
         ;;
       "C768" | "C1152")
         # Not valid resolutions for ensembles
-        declare -x "walltime_gdas"="00:40:00"
+        declare -x "walltime_gdas"="00:50:00"
         declare -x "walltime_gfs"="06:00:00"
         ;;
       *)
@@ -923,16 +923,21 @@ case ${step} in
       "C48" | "C96")
         ntasks=${CASE:1}
       ;;
-      "C192" | "C384" | "C768" )
+      "C192" | "C384" | "C768")
         ntasks=120
         memory="${mem_node_max}"
       ;;
+      "C1152")
+        ntasks=200
+        memory="${mem_node_max}"
+      ;;
       *)
         echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE}"
         exit 4
       ;;
     esac
     tasks_per_node=${ntasks}
+    [[ ${CASE} == "C1152" ]] && tasks_per_node=40
 
     threads_per_task=1
 
@@ -1005,7 +1010,7 @@ case ${step} in
     threads_per_task=1
     tasks_per_node=1
     memory="20G"
-    [[ ${CASE} == "C768" ]] && memory="80GB"
+    [[ ${CASE} == "C768" || ${CASE} == "C1152" ]] && memory="80GB"
     ;;
 
   "metp")
@@ -1145,7 +1150,7 @@ case ${step} in
     fi
 
     case ${CASE} in
-      "C768")                 ntasks=200;;
+      "C1152" | "C768")       ntasks=200;;
       "C384")                 ntasks=100;;
       "C192" | "C96" | "C48") ntasks=40;;
       *)
@@ -1178,7 +1183,7 @@ case ${step} in
   "eupd")
     walltime="00:30:00"
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         ntasks=480
         threads_per_task=6
         ;;
@@ -1223,7 +1228,7 @@ case ${step} in
 
   "epos")
     walltime="00:15:00"
-    [[ ${CASE} == "C768" ]] && walltime="00:25:00"
+    [[ ${CASE} == "C768" || ${CASE} == "C1152" ]] && walltime="00:25:00"
     ntasks=80
     threads_per_task=1
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))

diff --git a/parm/config/gfs/config.resources.GAEA b/parm/config/gfs/config.resources.GAEA
@@ -12,7 +12,7 @@ case ${step} in
     # The number of tasks and cores used must be the same for eobs
     # See https://github.com/NOAA-EMC/global-workflow/issues/2092 for details
     case ${CASE} in
-      "C768" | "C384")
+      "C1152" | "C768" | "C384")
         export tasks_per_node=50
         ;;
       *)

diff --git a/parm/config/gfs/config.resources.HERA b/parm/config/gfs/config.resources.HERA
@@ -32,7 +32,7 @@ case ${step} in
 
   "eupd")
     case ${CASE} in
-      "C768")
+      "C1152" | "C768")
         export ntasks=80
         export threads_per_task=20
         ;;
@@ -49,7 +49,7 @@ case ${step} in
     ;;
 
   "ecen")
-    if [[ "${CASE}" == "C768" ]]; then export threads_per_task=6; fi
+    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then export threads_per_task=6; fi
     export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 

diff --git a/parm/config/gfs/config.resources.JET b/parm/config/gfs/config.resources.JET
@@ -40,7 +40,7 @@ case ${step} in
     ;;
 
   "ecen")
-    if [[ "${CASE}" == "C768" ]]; then export threads_per_task=6; fi
+    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then export threads_per_task=6; fi
     export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     ;;
 

diff --git a/parm/config/gfs/config.resources.WCOSS2 b/parm/config/gfs/config.resources.WCOSS2
@@ -9,7 +9,7 @@ case ${step} in
     ;;
 
   "anal")
-    if [[ "${CASE}" == "C768" ]]; then
+    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
         export threads_per_task=8
         # Make ntasks a multiple of 16
         export ntasks_gdas=784
@@ -43,7 +43,7 @@ case ${step} in
 
   "eupd")
     case ${CASE} in
-      "C768" | "C384")
+      "C1152" | "C768" | "C384")
         export ntasks=315
         export threads_per_task=14
         ;;
@@ -55,7 +55,7 @@ case ${step} in
 
   "eobs")
     case ${CASE} in
-      "C768" | "C384")
+      "C1152" | "C768" | "C384")
         export tasks_per_node=50
         ;;
       *)

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
@@ -315,7 +315,7 @@ case "${fv3_res}" in
         export rf_cutoff=100.0
         export fv_sg_adj=450
         export WRITE_GROUP_GDAS=4
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=10  # TODO: refine these numbers when a case is available
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GDAS=20  # TODO: refine these numbers when a case is available
         export WRITE_GROUP_GFS=4
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20  # TODO: refine these numbers when a case is available
         ;;

diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ case ${step} in @@
         ;;
       "ecen")
-        if [[ "${CASE}" == "C768" ]]; then export threads_per_task=6; fi
+        if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then export threads_per_task=6; fi
         export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
         ;;
@@ Expand Down @@
+14 −14		.github/workflows/gcc.yml
+12 −9		.github/workflows/intel.yml
+30 −0		ci/spack_gcc.yaml
+7 −3		ci/spack_intel.yaml
+23 −0		modulefiles/gsiutils_container.intel.lua
+3 −3		modulefiles/gsiutils_gaeac5.intel.lua
+24 −0		modulefiles/gsiutils_gaeac6.intel.lua
+17 −8		src/netcdf_io/calc_analysis.fd/inc2anl.f90
+14 −6		ush/detect_machine.sh
+5 −0		ush/module-setup.sh