From 29cfbc208ffe6543e4856265977274003282f758 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Thu, 1 May 2025 18:21:05 +0000
Subject: [PATCH 1/3] Delete whitespace

---
 ush/parsing_namelists_FV3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index c0d67011cdb..0df2d49b3b7 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -43,7 +43,7 @@ local CHOUR=${current_cycle:8:2}
 local MOM6_OUTPUT_DIR="./MOM6_OUTPUT"
 
 if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
-  local current_cycle_p1 
+  local current_cycle_p1
   current_cycle_p1=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${FHOUT_OCN} hours" +%Y%m%d%H)
   local current_cycle_offset
   current_cycle_offset=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${OFFSET_START_HOUR} hours" +%Y%m%d%H)

From 056158efceb1b71e64d7b4ef02025f0e10e13914 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Thu, 1 May 2025 18:29:04 +0000
Subject: [PATCH 2/3] Set C48 deltim to 900 to align with skebint requirement

---
 parm/config/gfs/config.ufs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 11e81d8d60b..245089777c5 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -87,13 +87,16 @@ fi
 # (Standard) Model resolution dependent variables
 case "${fv3_res}" in
     "C48")
-        export layout_x=1
-        export layout_y=1
+        export layout_x=2
+        export layout_y=2
         export nthreads_fv3=1
         export nthreads_ufs=1
         export WRITE_GROUP=1
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=1
-        export DELTIM=1200
+        # TODO: change this back to 1200 when "SKEBINT" can be set
+        #       currently, the value is fixed to 1800 by the WM and must be a multiple of DELTIM
+        #       when running stochastic physics
+        export DELTIM=900
         export xr_cnvcld=".false."  # Do not pass conv. clouds to Xu-Randall cloud fraction
         export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export cdmbgwd_gsl="40.0,1.77,1.0,1.0"   # settings for GSL drag suite

From 2dbb0b6f42e54e86dd631515099edc58c7540b73 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Thu, 1 May 2025 18:32:36 +0000
Subject: [PATCH 3/3] Set deltim to 900 and increase layout for C48

---
 parm/config/gefs/config.ufs | 7 +++++--
 parm/config/gfs/config.ufs  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
index d4276c57186..a8504f36b16 100644
--- a/parm/config/gefs/config.ufs
+++ b/parm/config/gefs/config.ufs
@@ -71,8 +71,11 @@ fi
 # (Standard) Model resolution dependent variables
 case "${fv3_res}" in
     "C48")
-        export DELTIM=1200
-        export layout_x=1
+        # TODO: change this back to 1200 when "SKEBINT" can be set
+        #       currently, the value is fixed to 1800 by the WM and must be a multiple of DELTIM
+        #       when running stochastic physics
+        export DELTIM=900
+        export layout_x=2
         export layout_y=1
         export nthreads_fv3=1
         export nthreads_ufs=1
diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 245089777c5..245f2a57532 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -88,7 +88,7 @@ fi
 case "${fv3_res}" in
     "C48")
         export layout_x=2
-        export layout_y=2
+        export layout_y=1
         export nthreads_fv3=1
         export nthreads_ufs=1
         export WRITE_GROUP=1