From d069196eee4fd937334dd939f029d83d338035f6 Mon Sep 17 00:00:00 2001
From: John Alex <jpalex@Johns-MacBook-Air.local>
Date: Fri, 14 Aug 2026 14:36:54 -0400
Subject: [PATCH] fix(cmeps): Move CALENDAR to env_run.xml and add
 lock_on_restart="true"

---
 cime_config/config_component.xml        | 6 +++---
 cime_config/namelist_definition_drv.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 626110251..5ded394a3 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -738,12 +738,12 @@
     Must be explicitly set in env_build.xml for userdefined machine.</desc>
   </entry>
 
-  <entry id="CALENDAR">
+  <entry id="CALENDAR" lock_on_restart="true">
     <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>
 
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>