From 1b569131f7f487bf49f84fb3517b93b4624aa744 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Fri, 18 Oct 2024 13:51:29 -0500
Subject: [PATCH 1/5] v3.NARRM PE-layouts on Chrysalis

- Tiny:   10 nodes, ~1 sypd
- XSmall: 20 nodes, ~2 sypd
---
 cime_config/allactive/config_pesall.xml | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
index 3392ad71ca10..b5b802bc1364 100644
--- a/cime_config/allactive/config_pesall.xml
+++ b/cime_config/allactive/config_pesall.xml
@@ -2164,6 +2164,40 @@
       </pes>
     </mach>
   </grid>
+  <grid name="a%ne0np4_northamericax4v1.pg2_l%r025_oi%IcoswISC30E3">
+    <mach name="chrysalis">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="T">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 10 nodes ~1 sypd</comment>
+        <ntasks>
+          <ntasks_atm>576</ntasks_atm>
+          <ntasks_cpl>576</ntasks_cpl>
+          <ntasks_lnd>576</ntasks_lnd>
+          <ntasks_rof>576</ntasks_rof>
+          <ntasks_ice>576</ntasks_ice>
+          <ntasks_ocn>64</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>576</rootpe_ocn>
+        </rootpe>
+      </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XS">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 20 nodes ~2 sypd</comment>
+        <ntasks>
+          <ntasks_atm>1152</ntasks_atm>
+          <ntasks_cpl>1152</ntasks_cpl>
+          <ntasks_lnd>768</ntasks_lnd>
+          <ntasks_rof>768</ntasks_rof>
+          <ntasks_ice>384</ntasks_ice>
+          <ntasks_ocn>128</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>1152</rootpe_ocn>
+          <rootpe_lnd>384</rootpe_lnd>
+          <rootpe_rof>384</rootpe_rof>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="a%ne30np4_l%.+oi%oEC60to30.+w%wQU225EC60to30">
     <mach name="anvil|chrysalis">
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+WW3" pesize="any">

From 9ec257c5c55e330970602df65a579e5c5b76b99c Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Mon, 21 Oct 2024 22:09:00 -0500
Subject: [PATCH 2/5] v3.NARRM PE-layouts on Chrysalis

- Small:   30 nodes, ~3 sypd
- SMedium: 40 nodes, ~4 sypd
- Medium:  50 nodes, ~5 sypd
---
 cime_config/allactive/config_pesall.xml | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
index b5b802bc1364..c21b2d0932e2 100644
--- a/cime_config/allactive/config_pesall.xml
+++ b/cime_config/allactive/config_pesall.xml
@@ -2196,6 +2196,53 @@
           <rootpe_rof>384</rootpe_rof>
         </rootpe>
       </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 30 nodes ~3 sypd</comment>
+        <ntasks>
+          <ntasks_atm>1792</ntasks_atm>
+          <ntasks_cpl>1792</ntasks_cpl>
+          <ntasks_lnd>1280</ntasks_lnd>
+          <ntasks_rof>1280</ntasks_rof>
+          <ntasks_ice>512</ntasks_ice>
+          <ntasks_ocn>128</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>1792</rootpe_ocn>
+          <rootpe_lnd>512</rootpe_lnd>
+          <rootpe_rof>512</rootpe_rof>
+        </rootpe>
+      </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="SM">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 40 nodes ~4 sypd</comment>
+        <ntasks>
+          <ntasks_atm>2368</ntasks_atm>
+          <ntasks_cpl>2368</ntasks_cpl>
+          <ntasks_lnd>1408</ntasks_lnd>
+          <ntasks_rof>1408</ntasks_rof>
+          <ntasks_ice>960</ntasks_ice>
+          <ntasks_ocn>192</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>2368</rootpe_ocn>
+          <rootpe_ice>1408</rootpe_ice>
+        </rootpe>
+      </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 50 nodes ~5 sypd</comment>
+        <ntasks>
+          <ntasks_atm>3008</ntasks_atm>
+          <ntasks_cpl>3008</ntasks_cpl>
+          <ntasks_lnd>1856</ntasks_lnd>
+          <ntasks_rof>1856</ntasks_rof>
+          <ntasks_ice>1152</ntasks_ice>
+          <ntasks_ocn>192</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>3008</rootpe_ocn>
+          <rootpe_lnd>1152</rootpe_lnd>
+          <rootpe_rof>1152</rootpe_rof>
+        </rootpe>
+      </pes>
     </mach>
   </grid>
   <grid name="a%ne30np4_l%.+oi%oEC60to30.+w%wQU225EC60to30">

From 24cf2ae762f895c0d067218d5886c539e4ba1521 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Wed, 23 Oct 2024 20:59:33 -0500
Subject: [PATCH 3/5] XMedium: 64 nodes, ~6 sypd

---
 cime_config/allactive/config_pesall.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
index c21b2d0932e2..4eba082b40fd 100644
--- a/cime_config/allactive/config_pesall.xml
+++ b/cime_config/allactive/config_pesall.xml
@@ -2243,6 +2243,22 @@
           <rootpe_rof>1152</rootpe_rof>
         </rootpe>
       </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XM">
+        <comment>allactive+chrysalis: v3.NARRM tri-grid on 64 nodes ~6 sypd</comment>
+        <ntasks>
+          <ntasks_atm>3840</ntasks_atm>
+          <ntasks_cpl>3840</ntasks_cpl>
+          <ntasks_lnd>2304</ntasks_lnd>
+          <ntasks_rof>2304</ntasks_rof>
+          <ntasks_ice>1536</ntasks_ice>
+          <ntasks_ocn>256</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>3840</rootpe_ocn>
+          <rootpe_lnd>1536</rootpe_lnd>
+          <rootpe_rof>1536</rootpe_rof>
+        </rootpe>
+      </pes>
     </mach>
   </grid>
   <grid name="a%ne30np4_l%.+oi%oEC60to30.+w%wQU225EC60to30">

From e5a6ece47bfe61c67d87e201775c612da49218c6 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Fri, 25 Oct 2024 19:10:01 -0500
Subject: [PATCH 4/5] v3.NARRM PE-layouts on Anvil

- Small:    64 nodes, ~1.8 sypd
- SMedium:  96 nodes, ~2.5 sypd
- Medium:  128 nodes, ~3.2 sypd
---
 cime_config/allactive/config_pesall.xml | 46 +++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
index 4eba082b40fd..f3c92be3c6ab 100644
--- a/cime_config/allactive/config_pesall.xml
+++ b/cime_config/allactive/config_pesall.xml
@@ -2260,6 +2260,52 @@
         </rootpe>
       </pes>
     </mach>
+    <mach name="anvil">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
+        <comment>allactive+anvil: v3.NARRM tri-grid on 64 nodes ~1.8 sypd</comment>
+        <ntasks>
+          <ntasks_atm>2160</ntasks_atm>
+          <ntasks_cpl>2160</ntasks_cpl>
+          <ntasks_lnd>2160</ntasks_lnd>
+          <ntasks_rof>2160</ntasks_rof>
+          <ntasks_ice>2160</ntasks_ice>
+          <ntasks_ocn>144</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>2160</rootpe_ocn>
+        </rootpe>
+      </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
+        <comment>allactive+anvil: v3.NARRM tri-grid on 96 nodes ~2.5 sypd</comment>
+        <ntasks>
+          <ntasks_atm>3240</ntasks_atm>
+          <ntasks_cpl>3240</ntasks_cpl>
+          <ntasks_lnd>1080</ntasks_lnd>
+          <ntasks_rof>1080</ntasks_rof>
+          <ntasks_ice>2160</ntasks_ice>
+          <ntasks_ocn>216</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>3240</rootpe_ocn>
+          <rootpe_lnd>2160</rootpe_lnd>
+          <rootpe_rof>2160</rootpe_rof>
+        </rootpe>
+      </pes>
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
+        <comment>allactive+anvil: v3.NARRM tri-grid on 128 nodes ~3.2 sypd</comment>
+        <ntasks>
+          <ntasks_atm>4320</ntasks_atm>
+          <ntasks_cpl>4320</ntasks_cpl>
+          <ntasks_lnd>4320</ntasks_lnd>
+          <ntasks_rof>4320</ntasks_rof>
+          <ntasks_ice>4320</ntasks_ice>
+          <ntasks_ocn>288</ntasks_ocn>
+        </ntasks>
+        <rootpe>
+          <rootpe_ocn>4320</rootpe_ocn>
+        </rootpe>
+      </pes>
+    </mach>
   </grid>
   <grid name="a%ne30np4_l%.+oi%oEC60to30.+w%wQU225EC60to30">
     <mach name="anvil|chrysalis">

From 45336f23c33fe7eb7d02331a3e41b55050410e00 Mon Sep 17 00:00:00 2001
From: Azamat Mametjanov <azamat@mcs.anl.gov>
Date: Tue, 3 Dec 2024 12:50:19 -0600
Subject: [PATCH 5/5] Rename PE-layouts: S-20n, M-40n, L-64n.

---
 cime_config/allactive/config_pesall.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
index f3c92be3c6ab..5c0d44f74aef 100644
--- a/cime_config/allactive/config_pesall.xml
+++ b/cime_config/allactive/config_pesall.xml
@@ -2180,7 +2180,7 @@
           <rootpe_ocn>576</rootpe_ocn>
         </rootpe>
       </pes>
-      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XS">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
         <comment>allactive+chrysalis: v3.NARRM tri-grid on 20 nodes ~2 sypd</comment>
         <ntasks>
           <ntasks_atm>1152</ntasks_atm>
@@ -2196,7 +2196,7 @@
           <rootpe_rof>384</rootpe_rof>
         </rootpe>
       </pes>
-      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="SM">
         <comment>allactive+chrysalis: v3.NARRM tri-grid on 30 nodes ~3 sypd</comment>
         <ntasks>
           <ntasks_atm>1792</ntasks_atm>
@@ -2212,7 +2212,7 @@
           <rootpe_rof>512</rootpe_rof>
         </rootpe>
       </pes>
-      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="SM">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
         <comment>allactive+chrysalis: v3.NARRM tri-grid on 40 nodes ~4 sypd</comment>
         <ntasks>
           <ntasks_atm>2368</ntasks_atm>
@@ -2227,7 +2227,7 @@
           <rootpe_ice>1408</rootpe_ice>
         </rootpe>
       </pes>
-      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="M">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XM">
         <comment>allactive+chrysalis: v3.NARRM tri-grid on 50 nodes ~5 sypd</comment>
         <ntasks>
           <ntasks_atm>3008</ntasks_atm>
@@ -2243,7 +2243,7 @@
           <rootpe_rof>1152</rootpe_rof>
         </rootpe>
       </pes>
-      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="XM">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="L">
         <comment>allactive+chrysalis: v3.NARRM tri-grid on 64 nodes ~6 sypd</comment>
         <ntasks>
           <ntasks_atm>3840</ntasks_atm>