alpha-ctsm5.4.CMIP7.14.ctsm5.3.079: New raw lai, soilcolor, 1700-2023 landuse files, and NOANTHRO landuse file

.gitmodules

@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.61
+fxtag = ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

cime_config/config_component.xml

@@ -161,13 +161,12 @@
     <valid_values>cmip6,cmip7</valid_values>
     <default_value>cmip7</default_value>
     <values>
-      <value compset="NOANTHRO" >cmip6</value>
       <value compset="SSP" >cmip6</value>
     </values>
     <group>run_component_ctsm</group>
     <file>env_run.xml</file>
     <desc>Whether to use CMIP6 or CMIP7 fsurdat/landuse files.
-    As of ctsm5.4 we do not have CMIP7 PFT raw datasets for SSPs and NOANTHRO, so default to CMIP6 for these. For other compsets default to CMIP7. User may modify to a non-default value in env_run.xml.
+    As of ctsm5.4 we do not have CMIP7 PFT raw datasets for SSPs, so default to CMIP6 for these. For other compsets default to CMIP7. User may modify to a non-default value in env_run.xml.
 Caveats:
 1) We supply only CMIP7 C13/C14 isotope datasets, so these get used regardless.
 2) We supply only CMIP7 population density with ctsm6 in non-SSP cases, because the fire model is calibrated to that; conversely, for pre-ctsm6 and for SSP we supply only CMIP6 population density.

python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py

@@ -58,7 +58,7 @@
     "crop-global-SSP2-4.5-f19",
     "crop-global-SSP2-4.5-f10",
     "crop-global-SSP2-4.5-f45",
-    "crop-global-SSP2-4.5-vrandne120",
+    "crop-global-hist-vrandne120",
     "crop-global-SSP2-4.5-ne3",
     "crop-global-SSP2-4.5-ne16",
     "crop-global-SSP2-4.5-ne30",
@@ -389,8 +389,8 @@ def main():
             "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res",
             "f45",
         ),
-        "crop-global-SSP2-4.5-vrandne120": (
-            "--start-year 1979 --end-year 2030 --ssp-rcp SSP2-4.5 --res",
+        "crop-global-hist-vrandne120": (
+            "--start-year 1979 --end-year 2023 --res",
             "vr_and_ne120",
         ),
         "crop-global-SSP2-4.5-ne3": (

tools/mksurfdata_esmf/Makefile

@@ -97,8 +97,8 @@ STANDARD = \
 
 # NOTE slevis 2025/9/10: For CTSM5.4, I removed from CROP:
 #   crop-global-future
-# and I added here because it spans 1979-2030:
-#   crop-global-SSP2-4.5-vrandne120
+# and I added here because it spans 1979-2023:
+#   crop-global-hist-vrandne120
 # and I split ne3 into ne3-1, ne3-2, ne3-3 for historical because the combined ne3 job took >12 hours in the queue
 CROP = \
 	crop-global-hist \
@@ -125,7 +125,7 @@ CROP = \
 	crop-global-1850-ne16 \
 	crop-global-1850-ne30 \
 	crop-global-1850-mpasa480 \
-	crop-global-SSP2-4.5-vrandne120 \
+	crop-global-hist-vrandne120 \
 
 # Build the executable if it doesn't exist and any target depends on it
 $(MKSURFDATA_EXE):
@@ -350,8 +350,8 @@ crop-global-future : crop-global-SSP1-1.9-f09 \
 crop-global-SSP2-4.5-low-res : crop-global-SSP2-4.5-f10 \
                                crop-global-SSP2-4.5-f45 \
                                crop-global-SSP2-4.5-ne3
-# NOTE slevis 2025/9/10: For CTSM5.4, I moved to CROP because it spans 1979-2030:
-#   crop-global-SSP2-4.5-vrandne120
+# NOTE slevis 2025/9/10: For CTSM5.4, I moved to CROP because it spans 1979-2023:
+#   crop-global-hist-vrandne120
 crop-global-SSP2-4.5         : crop-global-SSP2-4.5-f09 \
                                crop-global-SSP2-4.5-f19 \
                                crop-global-SSP2-4.5-hcru \
@@ -400,7 +400,7 @@ crop-global-SSP2-4.5-ne30 : FORCE
 	$(MKSURFDATA)  --number-of-nodes 9 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
 	$(BATCHJOBS) [email protected]
 
-crop-global-SSP2-4.5-vrandne120 : FORCE
+crop-global-hist-vrandne120 : FORCE
 	$(MKSURFDATA)  --number-of-nodes 2 --scenario $@ --jobscript-file [email protected] --walltime 12:00:00
 	$(BATCHJOBS) [email protected]
 

tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml

@@ -10,7 +10,7 @@
 
   <mksrf_flai>
     <entry>
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histMKSRFDeg025_250417/mksrf_landuse_ctsm53_pftlai_CLIM.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_pftlai_clm6_histLUH3_2005_c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
     </entry>
   </mksrf_flai>
@@ -21,7 +21,7 @@
 
   <mksrf_fsoicol>
     <entry>
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histMKSRFDeg025_250417/mksrf_landuse_ctsm53_soilcolor_CLIM.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_soilcolor_clm6_histLUH3_2005_c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
     </entry>
   </mksrf_fsoicol>
@@ -204,37 +204,37 @@ version of the raw dataset will probably go away.
   <!-- ======================== -->
 
   <mksrf_fvegtyp>
-    <!-- Potential Vegetation dataset TODO Peter Lawrence? -->
+    <!-- Potential Vegetation dataset -->
     <entry pft_years="PtVg" >
-      <data_filename>lnd/clm2/rawdata/CTSM53RawData/globalctsm53histTRNOANTHRODeg025_240831/mksrf_landuse_ctsm53_histTRNOANTHRO_1.c240831.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_NOANTHRO_CMIP7/mksrf_landuse_clm6_noanthroLUH3_1.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_1850.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/mksrf_urban_0.05x0.05_zerourbanpct.cdf5.c181014.nc</urban_filename>
     </entry>
 
     <entry pft_years="1700">
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histCMIP7Deg025_250417/mksrf_landuse_ctsm53_histCMIP7_1700.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_landuse_clm6_histLUH3_1700.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_1850.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/CTSM54RawData/urban_properties/urban_properties_CMIP7_ThreeClass_1700_c250423.nc</urban_filename>
     </entry>
 
     <entry pft_years="1850">
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histCMIP7Deg025_250417/mksrf_landuse_ctsm53_histCMIP7_1850.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_landuse_clm6_histLUH3_1850.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_1850.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/CTSM54RawData/urban_properties/urban_properties_CMIP7_ThreeClass_1850_c250423.nc</urban_filename>
     </entry>
 
     <entry pft_years="2000">
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histCMIP7Deg025_250417/mksrf_landuse_ctsm53_histCMIP7_2000.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_landuse_clm6_histLUH3_2000.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_2000.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/CTSM54RawData/urban_properties/urban_properties_CMIP7_ThreeClass_2000_c250423.nc</urban_filename>
     </entry>
 
     <entry pft_years="2005">
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histCMIP7Deg025_250417/mksrf_landuse_ctsm53_histCMIP7_2005.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_landuse_clm6_histLUH3_2005.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_2005.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/CTSM54RawData/urban_properties/urban_properties_CMIP7_ThreeClass_2005_c250423.nc</urban_filename>
@@ -252,7 +252,7 @@ version of the raw dataset will probably go away.
     <!-- Lake and urban data from 1700 to 1849 is copied from 1850 -->
     <!-- Lake data from 2018 to 2023 is copied from 2017 -->
     <entry pft_years="1700-2023" >
-      <data_filename>lnd/clm2/rawdata/CTSM54RawData/globalctsm53histCMIP7Deg025_250417/mksrf_landuse_ctsm53_histCMIP7_%y.c250417.nc</data_filename>
+      <data_filename>lnd/clm2/rawdata/CTSM54RawData/CLM6_LUH3_HIST_CMIP7/mksrf_landuse_clm6_histLUH3_%y.c251012.nc</data_filename>
       <mesh_filename>lnd/clm2/mappingdata/grids/UNSTRUCTgrid_0.25x0.25_nomask_cdf5_c200129.nc</mesh_filename>
       <lake_filename>lnd/clm2/rawdata/lake_area/mksurf_lake_0.05x0.05_hist_clm5_hydrolakes_%y.cdf5.c20220325.nc</lake_filename>
       <urban_filename>lnd/clm2/rawdata/CTSM54RawData/urban_properties/urban_properties_CMIP7_ThreeClass_%y_c250423.nc</urban_filename>