From a6ca315cfbd753fe4230334f915f556c218fba2d Mon Sep 17 00:00:00 2001
From: Tomas Torsvik <tomas.torsvik.work@gmail.com>
Date: Mon, 30 Mar 2026 14:32:02 +0200
Subject: [PATCH 1/3] Update CIME tag to cime5.6.10_NorESM2.3.0_v1

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 58784efe..73b94a54 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -14,7 +14,7 @@ local_path = components/cice
 required = True
 
 [cime]
-tag = cime5.6.10_NorESM2_3_r7
+tag = cime5.6.10_NorESM2.3.0_v1
 protocol = git
 repo_url = https://github.com/NorESMhub/cime
 local_path = cime

From 2bcde5d5b5400e448773f85ccd9a7eac1affa3b0 Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <stevenng@met.no>
Date: Wed, 8 Apr 2026 15:36:58 +0200
Subject: [PATCH 2/3] Update CIME tag

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 73b94a54..57f4ae56 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -14,7 +14,7 @@ local_path = components/cice
 required = True
 
 [cime]
-tag = cime5.6.10_NorESM2.3.0_v1
+tag = cime5.6.10_NorESM2.3.0_v2
 protocol = git
 repo_url = https://github.com/NorESMhub/cime
 local_path = cime

From 28662ce9228f831316d71c7aae6be627b326b2ca Mon Sep 17 00:00:00 2001
From: Tomas Torsvik <tomas.torsvik@uib.no>
Date: Tue, 28 Apr 2026 10:00:30 +0200
Subject: [PATCH 3/3] Remove PES configs for decomissioned machines

---
 cime_config/config_pes.xml | 411 ++-----------------------------------
 1 file changed, 16 insertions(+), 395 deletions(-)

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 9eab2d2a..dec401b8 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -274,7 +274,7 @@
   
   <!--djlo temporarily commented out-->  
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1051,7 +1051,7 @@
 
   <!--djlo temporarily commented out-->
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="X1" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1089,7 +1089,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="L" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1126,44 +1126,6 @@
     </mach>
   </grid>
 
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="any" compset="CAM60%PTAERO.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1536</ntasks_atm>
-          <ntasks_lnd>780</ntasks_lnd>
-          <ntasks_rof>20</ntasks_rof>
-          <ntasks_ice>736</ntasks_ice>
-          <ntasks_ocn>91</ntasks_ocn>
-          <ntasks_glc>1536</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>1536</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>780</rootpe_rof>
-          <rootpe_ice>800</rootpe_ice>
-          <rootpe_ocn>1536</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
     <mach name="betzy">
       <pes pesize="L" compset="CAM60%PTAERO_CLM50%BGC-CROP_CICE%NORESM-CMIP6_BLOM%ECO">
@@ -1315,157 +1277,6 @@
       </pes>
     </mach>
   </grid>
- <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="X1" compset="CAM60%PTAERO.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1728</ntasks_atm>
-          <ntasks_lnd>780</ntasks_lnd>
-          <ntasks_rof>20</ntasks_rof>
-          <ntasks_ice>736</ntasks_ice>
-          <ntasks_ocn>91</ntasks_ocn>
-          <ntasks_glc>1728</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>1728</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>780</rootpe_rof>
-          <rootpe_ice>800</rootpe_ice>
-          <rootpe_ocn>1728</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="any" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1536</ntasks_atm>
-          <ntasks_lnd>780</ntasks_lnd>
-          <ntasks_rof>20</ntasks_rof>
-          <ntasks_ice>736</ntasks_ice>
-          <ntasks_ocn>91</ntasks_ocn>
-          <ntasks_glc>1536</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>1536</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>780</rootpe_rof>
-          <rootpe_ice>800</rootpe_ice>
-          <rootpe_ocn>1536</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="X1" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1728</ntasks_atm>
-          <ntasks_lnd>780</ntasks_lnd>
-          <ntasks_rof>20</ntasks_rof>
-          <ntasks_ice>736</ntasks_ice>
-          <ntasks_ocn>91</ntasks_ocn>
-          <ntasks_glc>1728</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>1728</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>780</rootpe_rof>
-          <rootpe_ice>800</rootpe_ice>
-          <rootpe_ocn>1728</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="S" compset="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>256</ntasks_atm>
-          <ntasks_lnd>200</ntasks_lnd>
-          <ntasks_rof>6</ntasks_rof>
-          <ntasks_ice>50</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>256</ntasks_glc>
-          <ntasks_wav>256</ntasks_wav>
-          <ntasks_cpl>256</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>200</rootpe_rof>
-          <rootpe_ice>106</rootpe_ice>
-          <rootpe_ocn>256</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
     <mach name="betzy">
@@ -1506,7 +1317,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="X1" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1543,44 +1354,6 @@
     </mach>
   </grid>
 
-  <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="M" compset="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1024</ntasks_atm>
-          <ntasks_lnd>800</ntasks_lnd>
-          <ntasks_rof>12</ntasks_rof>
-          <ntasks_ice>212</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>1024</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>1024</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>800</rootpe_rof>
-          <rootpe_ice>812</rootpe_ice>
-          <rootpe_ocn>1024</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v4" >
     <mach name="betzy">
       <pes pesize="M" compset="any">
@@ -1659,7 +1432,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v3" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1697,7 +1470,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx1v1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="M" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1735,7 +1508,7 @@
   </grid>
 
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -1772,44 +1545,6 @@
     </mach>
   </grid>
 
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="any" compset="CAM60%PTAERO.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>768</ntasks_atm>
-          <ntasks_lnd>256</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>504</ntasks_ice>
-          <ntasks_ocn>186</ntasks_ocn>
-          <ntasks_glc>768</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>768</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>256</rootpe_rof>
-          <rootpe_ice>264</rootpe_ice>
-          <rootpe_ocn>768</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
     <mach name="betzy">
       <pes pesize="M" compset="CAM60%PTAERO.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
@@ -1848,44 +1583,6 @@
     </mach>
   </grid>
 
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="any" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>768</ntasks_atm>
-          <ntasks_lnd>256</ntasks_lnd>
-          <ntasks_rof>8</ntasks_rof>
-          <ntasks_ice>504</ntasks_ice>
-          <ntasks_ocn>186</ntasks_ocn>
-          <ntasks_glc>768</ntasks_glc>
-          <ntasks_wav>300</ntasks_wav>
-          <ntasks_cpl>768</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>256</rootpe_rof>
-          <rootpe_ice>264</rootpe_ice>
-          <rootpe_ocn>768</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
     <mach name="betzy">
       <pes pesize="M" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
@@ -1962,44 +1659,6 @@
     </mach>
   </grid>
 
-  <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="S" compset="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>192</ntasks_atm>
-          <ntasks_lnd>100</ntasks_lnd>
-          <ntasks_rof>12</ntasks_rof>
-          <ntasks_ice>80</ntasks_ice>
-          <ntasks_ocn>32</ntasks_ocn>
-          <ntasks_glc>192</ntasks_glc>
-          <ntasks_wav>192</ntasks_wav>
-          <ntasks_cpl>192</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>100</rootpe_rof>
-          <rootpe_ice>112</rootpe_ice>
-          <rootpe_ocn>192</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid>
-
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
     <mach name="betzy">
       <pes pesize="X1" compset="any">
@@ -2039,7 +1698,7 @@
   </grid>
 
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2077,7 +1736,7 @@
   </grid>
 
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%tnx1v3" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2115,7 +1774,7 @@
   </grid>
 
   <grid name="a%0.23x0.31.+l%0.23x0.31.+oi%tnx0.25v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2153,7 +1812,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx0.125v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM">
         <comment>none</comment>
         <ntasks>
@@ -2191,7 +1850,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx0.25v1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2229,7 +1888,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx0.25v3" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2267,7 +1926,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx0.25v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="CAM60%NORESM.+CLM50%BGC-CROP.+CICE.+BLOM%ECO">
         <comment>none</comment>
         <ntasks>
@@ -2305,7 +1964,7 @@
   </grid>
 
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%tnx0.25v4" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>
@@ -2343,47 +2002,9 @@
   </grid>
   <!--/djlo-->
 
-  <!--grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name="hexagon|vilje|fram">
-      <pes pesize="any" compset="any">
-        <comment>none</comment>
-        <ntasks>
-          <ntasks_atm>1920</ntasks_atm>
-          <ntasks_lnd>1000</ntasks_lnd>
-          <ntasks_rof>20</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
-          <ntasks_ocn>216</ntasks_ocn>
-          <ntasks_glc>1920</ntasks_glc>
-          <ntasks_wav>1920</ntasks_wav>
-          <ntasks_cpl>1920</ntasks_cpl>
-        </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>0</rootpe_atm>
-          <rootpe_lnd>0</rootpe_lnd>
-          <rootpe_rof>1000</rootpe_rof>
-          <rootpe_ice>1020</rootpe_ice>
-          <rootpe_ocn>1920</rootpe_ocn>
-          <rootpe_glc>0</rootpe_glc>
-          <rootpe_wav>0</rootpe_wav>
-          <rootpe_cpl>0</rootpe_cpl>
-        </rootpe>
-      </pes>
-    </mach>
-  </grid-->
-
   <!--djlo commented out-->
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1" >
-    <mach name="hexagon|vilje|fram|betzy">
+    <mach name="betzy">
       <pes pesize="any" compset="any">
         <comment>none</comment>
         <ntasks>