Updates to resources and yaml files from GFS C1152 cycled testing

dev/ci/cases/gfsv17/C1152mx025_S2SW.yaml

@@ -0,0 +1,23 @@
+experiment:
+  system: gfs
+  mode: cycled
+
+arguments:
+  account: {{ 'HPC_ACCOUNT' | getenv }}
+  pslot: {{ 'pslot' | getenv }}
+  app: S2SW
+  resdetatmos: 1152
+  resensatmos: 384
+  resdetocean: 0.25
+  nens: 80
+  interval: 6
+  start: warm
+  comroot: /lfs/h2/emc/ptmp/emc.global/RETRO_GFSv17/comroot
+  expdir: /lfs/h2/emc/global/noscrub/emc.global/RETRO_GFSv17/expdir  
+  idate: 2024111506
+  edate: 2025011600
+  icsdir: /lfs/h2/emc/physics/noscrub/ruiyu.sun/ICs/RETROs/GFSv17_RETRO_warmATmic_withlandNspread_N_oceanicewave
+  #idate: 2023041506
+  #edate: 2023061600
+  #icsdir: /lfs/h2/emc/da/noscrub/catherine.thomas/ICS/C1152C384/2023041506
+  yaml: {{ HOMEgfs }}/ci/cases/gfsv17/s2sw.yaml

dev/ci/cases/gfsv17/C1152mx025_S2SW_rdhpcs.yaml

@@ -0,0 +1,23 @@
+experiment:
+  system: gfs
+  mode: cycled
+
+arguments:
+  account: {{ 'HPC_ACCOUNT' | getenv }}
+  pslot: {{ 'pslot' | getenv }}
+  app: S2SW
+  resdetatmos: 1152
+  resensatmos: 384
+  resdetocean: 0.25
+  nens: 80
+  interval: 0
+  start: warm
+  comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
+  expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
+  idate: 2024111506
+  edate: 2024111600
+  #gaea
+  icsdir: /gpfs/f6/drsa-precip3/world-shared/role.glopara/data/ICSDIR/retro_ICs 
+  #msu
+  #icsdir: /work2/noaa/global/role-global/data/ICSDIR/retro_ICs
+  yaml: {{ HOMEgfs }}/dev/ci/cases/gfsv17/s2sw.yaml

dev/ci/cases/gfsv17/s2sw.yaml

@@ -0,0 +1,32 @@
+defaults:
+  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+
+base:
+  DOIAU: "YES"
+  DO_JEDIATMVAR: "NO"
+  DO_JEDIATMENS: "NO"
+  DO_JEDIOCNVAR: "YES"
+  DO_JEDISNOWDA: "YES"
+  DO_GSISOILDA: "YES"
+  DO_MERGENSST: "NO"
+  DOHYBVAR: "YES"
+  DOHYBVAR_OCN: "YES"
+  DOLETKF_OCN: "NO"
+  DO_STARTMEM_FROM_JEDIICE: "YES"
+  DO_FIT2OBS: "YES"
+  DO_VERFOZN: "YES"
+  DO_VERFRAD: "YES"
+  EUPD_CYC: "both"
+  INTERVAL_GFS: 6
+  SDATE_GFS: 2024111512
+  FHMAX_GFS: 384
+  FHMAX_HF_GFS: 120
+
+prepoceanobs:
+  use_exp_obs: "YES"
+
+marineanl:
+  SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca            
+  SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
+  SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml.j2
+  SOCA_NINNER: 100

dev/parm/config/gfs/config.resources

@@ -310,10 +310,12 @@ case ${step} in
 
   "esnowanl")
     # below lines are for creating JEDI YAML
+    walltime="00:30:00"
     case "${CASE}" in
       "C1152" | "C768")
         layout_x=6
         layout_y=6
+        walltime="00:50:00"
         ;;
       "C384")
         layout_x=5
@@ -331,7 +333,6 @@ case ${step} in
     export layout_x
     export layout_y
 
-    walltime="00:30:00"
     ntasks=$(( layout_x * layout_y * 6 ))
     threads_per_task=2
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
@@ -516,7 +517,7 @@ case ${step} in
       "025")
         ntasks=480
         memory="256GB"
-	;;
+        ;;
       "050")  ntasks=16;;
       "100")  ntasks=16;;
       "500")  ntasks=16;;
@@ -563,10 +564,17 @@ case ${step} in
 
   "ocnanalecen")
     ntasks=16
+    walltime="00:10:00"
     case ${OCNRES} in
       "025")
-        ntasks=40
-        memory="256GB"
+        ntasks=256
+        if [[ "${NMEM_ENS}" -gt 30 ]]; then
+          memory="500GB"
+          walltime="01:30:00"
+        else
+          ntasks=40
+          memory="256GB"
+        fi
         ;;
       "050")
         ntasks=16
@@ -585,7 +593,6 @@ case ${step} in
         exit 4
     esac
 
-    walltime="00:10:00"
     export is_exclusive=True
     threads_per_task=1
     tasks_per_node=$(( max_tasks_per_node / 2 ))
@@ -668,6 +675,7 @@ case ${step} in
         "C1152" | "C768")
           ntasks=780
           threads_per_task=5
+          walltime="01:40:00"
           ;;
         "C384" | "C192")
           ntasks=160
@@ -682,7 +690,7 @@ case ${step} in
         exit 4
       esac
     elif [[ "${RUN}" = *gfs ]]; then
-      walltime="01:00:00"
+      walltime="01:20:00"
       case ${CASE} in
         "C1152" | "C768")
           ntasks=825
@@ -921,7 +929,7 @@ case ${step} in
           ;;
         "C768" | "C1152")
           # Not valid resolutions for ensembles
-          declare -x "walltime"="01:20:00"
+          declare -x "walltime"="01:50:00"
           ;;
         *)
           echo "FATAL ERROR: Resources not defined for job ${step} at resolution ${CASE} for ${RUN}"
@@ -1042,11 +1050,11 @@ case ${step} in
     ;;
 
   "genesis")
-    walltime="00:25:00"
+    walltime="00:40:00"
     ntasks=1
     threads_per_task=1
     tasks_per_node=1
-    memory="10G"
+    memory="20G"
     ;;
 
   "genesis_fsu")
@@ -1062,10 +1070,18 @@ case ${step} in
     ntasks=3
     threads_per_task=1
     tasks_per_node=1
-    memory="20G"
-    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
+    case "${CASE}" in
+      "C768")
         memory="80GB"
-    fi
+        ;;
+      "C1152")
+        memory="400GB"
+        walltime="01:20:00"
+        ;;
+      *)
+        memory="20GB"
+        ;;
+    esac
     ;;
 
   "metp")
@@ -1118,7 +1134,7 @@ case ${step} in
     ;;
 
   "arch_vrfy" | "earc_vrfy")
-    walltime="00:15:00"
+    walltime="00:30:00"
     ntasks=1
     tasks_per_node=1
     threads_per_task=1
@@ -1243,7 +1259,7 @@ case ${step} in
     ;;
 
   "eupd")
-    walltime="00:30:00"
+    walltime="00:45:00"
     case "${CASE}" in
       "C1152" | "C768")
         ntasks=480
@@ -1267,7 +1283,7 @@ case ${step} in
     ;;
 
   "ecen")
-    walltime="00:10:00"
+    walltime="00:20:00"
     ntasks=80
     threads_per_task=4
     if [[ "${CASE}" == "C384" || "${CASE}" == "C192" || "${CASE}" == "C96" || "${CASE}" == "C48" ]]; then

dev/parm/config/gfs/config.resources.GAEAC6

@@ -27,16 +27,30 @@ case ${step} in
       "C768")
         export ntasks=80
         export threads_per_task=20
+        export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+        ;;
+      "C1152")
+        export ntasks=480
+        export threads_per_task=6
+        export tasks_per_node=8
         ;;
       *)
         ;;
     esac
-  export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
   ;;
 
   "anal")
-    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
+    case ${CASE} in
+      "C768")
         export threads_per_task=8
+        ;;
+      "C1152")
+        export threads_per_task=16
+        ;;
+      *) 
+        ;;
+    esac
+    if [[ "${CASE}" == "C768" || "${CASE}" == "C1152" ]]; then
         # Make ntasks a multiple of 16
         if [[ "${RUN}" == "gdas" ]]; then
             export ntasks=784
@@ -46,7 +60,27 @@ case ${step} in
         export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
     fi
     ;;
-  *)
 
-  ;;
+  "marinebmat")
+    case ${OCNRES} in
+      "025")
+        tasks_per_node=$(( max_tasks_per_node / 4 )) 
+        ;;
+      *)
+        ;;
+    esac
+    ;;
+
+  "ocnanalecen")
+    case ${OCNRES} in
+      "025")
+        ntasks=288
+        tasks_per_node=12
+        ;;
+      *)
+        ;;
+    esac
+    ;;
+  *) 
+    ;;
 esac

dev/parm/config/gfs/config.ufs

@@ -293,9 +293,10 @@ case "${fv3_res}" in
         export nthreads_ufs=4
         export WRITE_GROUP=4
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=20 # TODO: refine these numbers when a case is available
+	                                                # For GAEAC6 use 60 
         if [[ "${RUN}" = *gdas ]]; then
-          export layout_x=8
-          export layout_y=16
+          export layout_x=16
+          export layout_y=24
         elif [[ "${RUN}" = *gfs ]]; then
           export layout_x=16
           export layout_y=24