From b93cbc3201d0c2a1538cf9e13d012a2283b02201 Mon Sep 17 00:00:00 2001
From: John Alex <jpalex@gmail.com>
Date: Fri, 31 Jul 2026 12:46:58 -0400
Subject: [PATCH 1/2] Fix #4122: Move CALENDAR to env_run.xml to allow keepexe
 with calendar changes

---
 cime_config/config_component.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 626110251..28fe812a8 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -742,8 +742,8 @@
     <type>char</type>
     <valid_values>NO_LEAP,GREGORIAN</valid_values>
     <default_value>NO_LEAP</default_value>
-    <group>build_def</group>
-    <file>env_build.xml</file>
+    <group>run_begin_stop_restart</group>
+    <file>env_run.xml</file>
     <desc>calendar type</desc>
   </entry>
 

From a1537e783a610b2a8427a53dfe5ea45effbc5197 Mon Sep 17 00:00:00 2001
From: John Alex <jpalex@gmail.com>
Date: Sat, 1 Aug 2026 18:59:11 -0400
Subject: [PATCH 2/2] Update CALENDAR description in
 namelist_definition_drv.xml to reference env_run.xml

---
 cime_config/namelist_definition_drv.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index cf1e2f63c..b624670a1 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -2736,8 +2736,8 @@
     <group>CLOCK_attributes</group>
     <valid_values>NO_LEAP,GREGORIAN</valid_values>
     <desc>
-      calendar in use.  [NO_LEAP, GREOGORIAN].
-      set by CALENDAR in env_build.xml
+      calendar in use.  [NO_LEAP, GREGORIAN].
+      set by CALENDAR in env_run.xml
     </desc>
     <values>
       <value>$CALENDAR</value>