From f3c142d2406090107176369ce9e0b2f7c59761e1 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 17 Oct 2023 16:30:49 +0000
Subject: [PATCH 1/5] set gsibec layout (#1936)

---
 parm/config/gfs/config.atmanl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/parm/config/gfs/config.atmanl b/parm/config/gfs/config.atmanl
index 0d388f94bd..b50cc1dbb3 100644
--- a/parm/config/gfs/config.atmanl
+++ b/parm/config/gfs/config.atmanl
@@ -19,6 +19,9 @@ export layout_y=1
 export io_layout_x=1
 export io_layout_y=1
 
+export layout_gsib_x=$(echo "${layout_x} * 3" | bc)
+export layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+
 export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
 
 echo "END: config.atmanl"

From 01bbfee8737f52d91b3bae12c3982392fe51e9dc Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Wed, 18 Oct 2023 18:06:26 +0000
Subject: [PATCH 2/5] change setting of atmanl and atmensanl layout to be
 consistent with aeroanl and landanl (#1936)

---
 parm/config/gfs/config.atmanl      | 10 ++--------
 parm/config/gfs/config.atmensanl   |  7 ++-----
 parm/config/gfs/config.resources   |  3 +++
 parm/config/gfs/yaml/defaults.yaml |  8 ++++++++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/parm/config/gfs/config.atmanl b/parm/config/gfs/config.atmanl
index b50cc1dbb3..abfbd80734 100644
--- a/parm/config/gfs/config.atmanl
+++ b/parm/config/gfs/config.atmanl
@@ -13,14 +13,8 @@ export STATICB_TYPE="gsibec"
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
 export INTERP_METHOD='barycentric'
 
-export layout_x=1
-export layout_y=1
-
-export io_layout_x=1
-export io_layout_y=1
-
-export layout_gsib_x=$(echo "${layout_x} * 3" | bc)
-export layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+export io_layout_x=@IO_LAYOUT_X@
+export io_layout_y=@IO_LAYOUT_Y@
 
 export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
 
diff --git a/parm/config/gfs/config.atmensanl b/parm/config/gfs/config.atmensanl
index 7a696fa734..58fd7b6e22 100644
--- a/parm/config/gfs/config.atmensanl
+++ b/parm/config/gfs/config.atmensanl
@@ -10,11 +10,8 @@ export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/lgetkf_prototype.yaml
 export ATMENSYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/lgetkf/lgetkf.yaml
 export INTERP_METHOD='barycentric'
 
-export layout_x=1
-export layout_y=1
-
-export io_layout_x=1
-export io_layout_y=1
+export io_layout_x=@IO_LAYOUT_X@
+export io_layout_y=@IO_LAYOUT_Y@
 
 export JEDIEXE=${HOMEgfs}/exec/fv3jedi_letkf.x
 
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index d6654b61ed..92f0ad4ec0 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -202,6 +202,9 @@ elif [[ "${step}" = "atmanlrun" ]]; then
     export layout_x=1
     export layout_y=1
 
+    export layout_gsib_x=$(echo "${layout_x} * 3" | bc)
+    export layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+
     export wtime_atmanlrun="00:30:00"
     npe_atmanlrun=$(echo "${layout_x} * ${layout_y} * 6" | bc)
     export npe_atmanlrun
diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
index 8c2b4ff22b..c0298edb18 100644
--- a/parm/config/gfs/yaml/defaults.yaml
+++ b/parm/config/gfs/yaml/defaults.yaml
@@ -6,6 +6,14 @@ base:
   DO_JEDILANDDA: "NO"
   DO_MERGENSST: "NO"
 
+atmanl:
+  IO_LAYOUT_X: 1
+  IO_LAYOUT_Y: 1
+
+atmensanl:
+  IO_LAYOUT_X: 1
+  IO_LAYOUT_Y: 1
+
 aeroanl:
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1

From 9fe34bb35037dbd19aa742495c9c825918f9a0bb Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Fri, 20 Oct 2023 20:34:46 +0000
Subject: [PATCH 3/5] address shellcheck warning (#1936)

---
 parm/config/gfs/config.resources | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index 52910248dc..f38b34b329 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -202,8 +202,10 @@ elif [[ "${step}" = "atmanlrun" ]]; then
     export layout_x=1
     export layout_y=1
 
-    export layout_gsib_x=$(echo "${layout_x} * 3" | bc)
-    export layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+    layout_gsib_x=$(echo "${layout_x} * 3" | bc)
+    export layout_gsib_x
+    layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+    export layout_gsib_y
 
     export wtime_atmanlrun="00:30:00"
     npe_atmanlrun=$(echo "${layout_x} * ${layout_y} * 6" | bc)

From ad5e723e987cd69481d2d888799bc22e905b35b0 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Sat, 21 Oct 2023 18:31:20 +0000
Subject: [PATCH 4/5] add layout to atmanlinit in config.resources (#1936)

---
 parm/config/gfs/config.resources | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index f38b34b329..1f37b6ae7d 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -189,6 +189,15 @@ elif [[ ${step} = "waveawipsgridded" ]]; then
 
 elif [[ "${step}" = "atmanlinit" ]]; then
 
+    # make below case dependent later
+    export layout_x=1
+    export layout_y=1
+
+    layout_gsib_x=$(echo "${layout_x} * 3" | bc)
+    export layout_gsib_x
+    layout_gsib_y=$(echo "${layout_y} * 2" | bc)
+    export layout_gsib_y
+
     export wtime_atmanlinit="00:10:00"
     export npe_atmanlinit=1
     export nth_atmanlinit=1
@@ -202,11 +211,6 @@ elif [[ "${step}" = "atmanlrun" ]]; then
     export layout_x=1
     export layout_y=1
 
-    layout_gsib_x=$(echo "${layout_x} * 3" | bc)
-    export layout_gsib_x
-    layout_gsib_y=$(echo "${layout_y} * 2" | bc)
-    export layout_gsib_y
-
     export wtime_atmanlrun="00:30:00"
     npe_atmanlrun=$(echo "${layout_x} * ${layout_y} * 6" | bc)
     export npe_atmanlrun

From 06ee45dae21684d85bc016a725773a2d46f1213e Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Sat, 21 Oct 2023 20:05:58 +0000
Subject: [PATCH 5/5] add layout to atmensanlinit in config.resources (#1936)

---
 parm/config/gfs/config.resources | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
index 1f37b6ae7d..7fc80b0266 100644
--- a/parm/config/gfs/config.resources
+++ b/parm/config/gfs/config.resources
@@ -799,6 +799,10 @@ elif [[ ${step} = "stage_ic" ]]; then
 
 elif [[ "${step}" = "atmensanlinit" ]]; then
 
+    # make below case dependent later
+    export layout_x=1
+    export layout_y=1
+
     export wtime_atmensanlinit="00:10:00"
     export npe_atmensanlinit=1
     export nth_atmensanlinit=1