From 2841a0554bdc5b333992c6c55b99a3449a76f8ed Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 25 Sep 2023 10:50:00 -0600
Subject: [PATCH] Work on handling more LND_TUNING_MODE which is then changed
 in buildnml to a smaller subset

---
 cime_config/config_component.xml | 63 ++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 677219ec8c..9199947205 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -61,23 +61,56 @@
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>
     <desc>Tuning parameters and initial conditions should be optimized for what CLM model version and what meteorlogical forcing combination?
+          Options for all combinations of CLM physics and atm forcing are given. The buildnml and namelist_defaults will narrow it down to the ones
+          that have been tuned. The buildnml will also warn you if a tuning combination is based on another set.
+          Atm forcing options:
+               CRUv7
+               GSWP3
+               CAM6.0
+               QIAN   (not tuned)
+               1PT    (not tuned)
+               NLDAS2 (not tuned)
+               ERA5   (not tuned)
+          Other atm forcing options are invalid to run CLM and will result in an error.
     </desc>
     <default_value>UNSET</default_value>
-    <valid_values>clm5_0_cam6.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam6.0,clm5_1_GSWP3v1,clm5_1_cam6.0</valid_values>
-    <values>
-      <value compset=             "CLM45" >clm4_5_CRUv7</value>
-      <value compset="DATM%CRUv7.+_CLM45" >clm4_5_CRUv7</value>
-      <value compset="DATM%GSWP3.+_CLM45" >clm4_5_GSWP3v1</value>
-      <value compset="CAM.+_CLM45"        >clm4_5_cam6.0</value>
-      <value compset="DATM%CPLHIST.*_CLM45" >clm4_5_cam6.0</value>
-      <value compset=             "CLM50" >clm5_0_CRUv7</value>
-      <value compset="DATM%CRUv7.+_CLM50" >clm5_0_CRUv7</value>
-      <value compset="DATM%GSWP3.+_CLM50" >clm5_0_GSWP3v1</value>
-      <value compset="CAM.+_CLM50"        >clm5_0_cam6.0</value>
-      <value compset="DATM%CPLHIST.*_CLM50" >clm5_0_cam6.0</value>
-      <value compset="CAM.+_CLM51"        >clm5_1_cam6.0</value>
-      <value compset="DATM%CPLHIST.*_CLM51" >clm5_1_cam6.0</value>
-      <value compset=            "_CLM51" >clm5_1_GSWP3v1</value>
+    <!-- 7 forcing options for each CLM physics option: CRUv7, GSWP3, cam6.0, QIAN, 1PT, NLDAS2, ERA5 -->
+    <valid_values>clm5_0_cam6.0,clm5_0_GSWP3v1,clm5_0_CRUv7,clm5_0_QIAN,clm5_0_1PT,clm5_0_NLDAS2,clm5_0_ERA5,clm4_5_CRUv7,clm4_5_GSWP3v1,clm4_5_cam6.0,clm4_5_1PT,clm4_5_NLDAS2,clm4_5_ERA5,clm5_1_CRUv7,clm5_1_GSWP3v1,clm5_1_cam6.0,clm5_1_QIAN,clm5_1_1PT,clm5_1_NLDAS2,clm5_1_ERA5</valid_values>
+    <values match="last">
+      <!-- Options for atm forcing are: CRU, CRUv7, GSWP3, cam6.0 (also used for DATM%CPLHIST), QIAN, WISOQIA, 1PT, NLDAS2, and ERA5) -->
+      <!-- All the clm4_5 physics options -->
+      <value compset="DATM%CRUv7_CLM45"  >clm4_5_CRUv7</value>
+      <value compset="DATM%CRU_CLM45"    >clm4_5_CRUv7</value>
+      <value compset="DATM%GSWP3_CLM45"  >clm4_5_GSWP3v1</value>
+      <value compset="CAM.*_CLM45"         >clm4_5_cam6.0</value>
+      <value compset="DATM%CPLHIST_CLM45">clm4_5_cam6.0</value>
+      <value compset="DATM%QIA_CLM45"    >clm4_5_QIAN</value>
+      <value compset="DATM%WISOQIA_CLM45">clm4_5_QIAN</value>
+      <value compset="DATM%1PT_CLM45"    >clm4_5_1PT</value>
+      <value compset="DATM%NLDAS2_CLM45" >clm4_5_NLDAS2</value>
+      <value compset="DATM%ERA5_CLM45"   >clm4_5_ERA5</value>
+      <!-- All the clm5_0 physics options -->
+      <value compset="DATM%CRUv7_CLM50"  >clm5_0_CRUv7</value>
+      <value compset="DATM%CRU_CLM50"    >clm5_0_CRUv7</value>
+      <value compset="DATM%GSWP3_CLM50"  >clm5_0_GSWP3v1</value>
+      <value compset="CAM.+_CLM50"         >clm5_0_cam6.0</value>
+      <value compset="DATM%CPLHIST_CLM50">clm5_0_cam6.0</value>
+      <value compset="DATM%QIA_CLM50"    >clm5_0_QIAN</value>
+      <value compset="DATM%WISOQIA_CLM50">clm5_0_QIAN</value>
+      <value compset="DATM%1PT_CLM50"    >clm5_0_1PT</value>
+      <value compset="DATM%NLDAS2_CLM50" >clm5_0_NLDAS2</value>
+      <value compset="DATM%ERA5_CLM50"   >clm5_0_ERA5</value>
+      <!-- All the clm5_1 physics options -->
+      <value compset="DATM%CRUv7_CLM51"  >clm5_1_CRUv7</value>
+      <value compset="DATM%CRU_CLM51"    >clm5_1_CRUv7</value>
+      <value compset="DATM%GSWP3_CLM51"  >clm5_1_GSWP3v1</value>
+      <value compset="CAM.*_CLM51"         >clm5_1_cam6.0</value>
+      <value compset="DATM%CPLHIST_CLM51">clm5_1_cam6.0</value>
+      <value compset="DATM%QIA_CLM51"    >clm5_1_QIAN</value>
+      <value compset="DATM%WISOQIA_CLM51">clm5_1_QIAN</value>
+      <value compset="DATM%1PT_CLM51"    >clm5_1_1PT</value>
+      <value compset="DATM%NLDAS2_CLM51" >clm5_1_NLDAS2</value>
+      <value compset="DATM%ERA5_CLM51"   >clm5_1_ERA5</value>
     </values>
   </entry>