From ab3b94d634e5029740a4460d15314319bdfb93c5 Mon Sep 17 00:00:00 2001
From: Mats Bentsen <mben@norceresearch.no>
Date: Wed, 27 Nov 2024 13:20:24 +0100
Subject: [PATCH 1/2] Modified compsets with JRA interannual forcing to use
 year range 1958-2018 (same as NorESM2 used for CMIP6/OMIP2).

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

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 0a83cb2d..69532ca3 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -78,7 +78,7 @@
 
   <compset>
     <alias>NOIIAJRA</alias>
-    <lname>2000_DATM%JRA_SLND_CICE_BLOM_DROF%JRA_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -88,7 +88,7 @@
 
   <compset>
     <alias>NOIIAJRAOC</alias>
-    <lname>2000_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
+    <lname>2000_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -98,7 +98,7 @@
 
   <compset>
     <alias>NOIIAJRAOC1850</alias>
-    <lname>1850_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
+    <lname>1850_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -108,7 +108,7 @@
 
   <compset>
     <alias>NOIIAJRAOC20TR</alias>
-    <lname>20TR_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV</lname>
+    <lname>20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
   </compset>
   <compset>
     <!-- not valid for noresm2.5 -->
@@ -143,7 +143,7 @@
         <value  compset="20TR_DATM%IAF_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
         <value  compset="20TR_DATM%JRA_SLND_CICE%NORESM-CMIP6_BLOM%ECO_DROF%JRA_SGLC_SWAV">1653-01-01</value>
         <value  compset="20TR_DATM%IAF_SLND_CICE_BLOM%ECO_DROF%IAF_SGLC_SWAV">1700-01-01</value>
-        <value  compset="20TR_DATM%JRA_SLND_CICE_BLOM%ECO_DROF%JRA_SGLC_SWAV">1653-01-01</value>
+        <value  compset="20TR_DATM%JRA-1p4-2018_SLND_CICE_BLOM%ECO_DROF%JRA-1p4-2018_SGLC_SWAV">1653-01-01</value>
       </values>
     </entry>
   </entries>

From 4c4a2d4b192e6ba323824dd702e3a4913f3291ee Mon Sep 17 00:00:00 2001
From: Mats Bentsen <mben@norceresearch.no>
Date: Wed, 27 Nov 2024 13:23:27 +0100
Subject: [PATCH 2/2] Modified processor layout for TL319_tnx1v4 grids to be
 consistent with or without iHAMOCC enabled.

---
 cime_config/config_pes.xml | 56 ++++++--------------------------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 50cf1999..8c39e626 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -246,9 +246,9 @@
         <comment>none</comment>
         <ntasks>
           <ntasks_atm>128</ntasks_atm>
-          <ntasks_rof>16</ntasks_rof>
-          <ntasks_ice>96</ntasks_ice>
-          <ntasks_ocn>156</ntasks_ocn>
+          <ntasks_rof>128</ntasks_rof>
+          <ntasks_ice>128</ntasks_ice>
+          <ntasks_ocn>354</ntasks_ocn>
           <ntasks_cpl>128</ntasks_cpl>
           <ntasks_lnd>128</ntasks_lnd>
           <ntasks_glc>128</ntasks_glc>
@@ -267,8 +267,8 @@
         <rootpe>
           <rootpe_atm>0</rootpe_atm>
           <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>16</rootpe_rof>
-          <rootpe_ice>32</rootpe_ice>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
           <rootpe_ocn>128</rootpe_ocn>
           <rootpe_glc>0</rootpe_glc>
           <rootpe_wav>0</rootpe_wav>
@@ -278,10 +278,11 @@
     </mach>
   </grid>
 
+  <!-- 512 pes is minimum setting for normal job size on betzy !-->
   <grid name="a%TL319.+oi%tnx1v4">
-    <mach name="any">
-      <pes pesize="M" compset="_DATM.*_BLOM%ECO">
-        <comment>none</comment>
+    <mach name="betzy">
+      <pes pesize="L" compset="any">
+        <comment>Large pe-layout with 512 pes in total</comment>
         <ntasks>
           <ntasks_atm>128</ntasks_atm>
           <ntasks_rof>128</ntasks_rof>
@@ -315,45 +316,6 @@
       </pes>
     </mach>
   </grid>
-
-  <!-- 512 pes is minimum setting for normal job size on betzy !-->
-  <grid name="a%TL319.+oi%tnx1v4">
-    <mach name="betzy">
-      <pes pesize="L" compset="_DATM.*_BLOM">
-        <comment>Large pe-layout with 512 pes in total</comment>
-        <ntasks>
-          <ntasks_atm>1</ntasks_atm>
-          <ntasks_rof>1</ntasks_rof>
-          <ntasks_ice>154</ntasks_ice>
-          <ntasks_ocn>354</ntasks_ocn>
-          <ntasks_cpl>158</ntasks_cpl>
-          <ntasks_lnd>1</ntasks_lnd>
-          <ntasks_glc>1</ntasks_glc>
-          <ntasks_wav>1</ntasks_wav>
-        </ntasks>
-        <nthrds>
-          <nthrds_atm>1</nthrds_atm>
-          <nthrds_lnd>1</nthrds_lnd>
-          <nthrds_rof>1</nthrds_rof>
-          <nthrds_ice>1</nthrds_ice>
-          <nthrds_ocn>1</nthrds_ocn>
-          <nthrds_glc>1</nthrds_glc>
-          <nthrds_wav>1</nthrds_wav>
-          <nthrds_cpl>1</nthrds_cpl>
-        </nthrds>
-        <rootpe>
-          <rootpe_atm>155</rootpe_atm>
-          <rootpe_lnd>156</rootpe_lnd>
-          <rootpe_rof>157</rootpe_rof>
-          <rootpe_ice>0</rootpe_ice>
-          <rootpe_ocn>158</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
   <!-- GRID: TL319_tn14 : end !-->
 
   <grid name="a%0.9x1.25.+oi%tnx1v4|a%1.9x2.5.+oi%tnx1v4">