Skip to content

alpha-ctsm5.4.CMIP7.12.ctsm5.3.075: Add support for CLM_CMIP_ERA (= "cmip6" or "cmip7") #3501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Oct 14, 2025
Merged

alpha-ctsm5.4.CMIP7.12.ctsm5.3.075: Add support for CLM_CMIP_ERA (= "cmip6" or "cmip7") #3501

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e66386b
Introduce cmip_era flag (= cmip6 or cmip7) to namelist_defaults
slevis-lmwg Sep 24, 2025
0f4808c
Introduce CLM_CMIP_ERA flag to env_run.xml (= cmip6 or cmip7)
slevis-lmwg Sep 24, 2025
a30efab
Remove newly introduced namelist_defaults_cmip_era.xml
slevis-lmwg Sep 26, 2025
f408835
Add cmip7 flag also for historical landuse files (f09, f19, ne30)
slevis-lmwg Sep 26, 2025
0cf3e80
Add the cmip_era flag to all fsurdat/landuse add_default calls
slevis-lmwg Sep 26, 2025
6101487
Rm previously expected failures requiring finidat with c13/c14 to PASS
slevis-lmwg Sep 30, 2025
3a0870f
Rm another expected failure that required finidat with c13/c14 to PASS
slevis-lmwg Sep 30, 2025
db3540d
Mention CLM_CMIP_ERA in namelist error message for easier debugging
slevis-lmwg Oct 1, 2025
3b15fbc
namelist_defaults updates for better error catching
slevis-lmwg Oct 1, 2025
1283fb7
Remove another expected failure documented in issue #1733
slevis-lmwg Oct 1, 2025
14f647d
Remove expected failure in MODEL_BUILD documented in issue #3182
slevis-lmwg Oct 1, 2025
6c8128a
Add details to CLM_CMIP_ERA documentation in env_run.xml
slevis-lmwg Oct 2, 2025
a812454
Add back the cmip6 flanduse defaults for f09, f19, ne30
slevis-lmwg Oct 2, 2025
968eb7b
Add back the cmip6 fsurdat default for f09 2000
slevis-lmwg Oct 2, 2025
d4af81e
Add another detail to the CLM_CMIP_ERA documentation in env_run.xml
slevis-lmwg Oct 2, 2025
7bf8c5b
Add same details to the cmip_era documentation in namelist_definition
slevis-lmwg Oct 2, 2025
edf26a7
Put back use_init_interp that I removed in 71f2db2
slevis-lmwg Oct 2, 2025
26d8088
Remove SSP test from expected fails
slevis-lmwg Oct 2, 2025
c429f5f
Changing build-namelist_test.pl; corresponding bug-fix in nml defaults
slevis-lmwg Oct 8, 2025
db26aaa
Fix 2 build-namelist tests that started failing in ctsm5.3.032
slevis-lmwg Oct 9, 2025
f16276d
Rename 2nd inventoryfileDNE test to useFATESLUH2fileDNE
slevis-lmwg Oct 9, 2025
8100fa8
Resolve build-namelist tests, though not all, yet
slevis-lmwg Oct 9, 2025
3beef40
Resolved remaining fails (except 2 expected ones) in build-namelist
slevis-lmwg Oct 9, 2025
807040d
Change from "if a equals b" to "if a contains b" where b are SSP cases
slevis-lmwg Oct 13, 2025
826cee4
Add LAI streams test to expected fails for now
slevis-lmwg Oct 13, 2025
2e271ca
Remove unnecessary change to namelist_definition_ctsm.xml
slevis-lmwg Oct 13, 2025
4ff9e68
New and updated comments pertaining to CLM_CMIP_ERA
slevis-lmwg Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,11 @@ sub setup_cmdl_resolution {
$log->verbose_message( "This is NOT a NEON site" );
}

#
# To determine CMIP era
#
$nl_flags->{'cmip_era'} = $envxml_ref->{'CLM_CMIP_ERA'};

}

#-------------------------------------------------------------------------------
Expand Down
23 changes: 23 additions & 0 deletions bld/namelist_files/namelist_defaults_cmip_era.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0"?>

<?xml-stylesheet type="text/xsl" href="namelist_defaults.xsl"?>

<namelist_defaults>

<!--
Values to use by default for creation of CLM model driver namelists.
The element names are the same as the corresponding namelist
variables. Values that depend on the model configuration use
attributes to express the dependency. The recognized attributes
are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
attributes from the config_cache.xml file (with keys converted to upper-case).
-->

<!-- Defaults for cmip_era_inparm namelist -->
<cmip_era>cmip7</cmip_era>
<cmip_era sim_year="PtVg" >cmip6</cmip_era>
<cmip_era sim_year_range="1850-2100" >cmip6</cmip_era>
<cmip_era sim_year_range="2000-2100" >cmip6</cmip_era>
<cmip_era sim_year_range="2000-2025" >cmip6</cmip_era>

</namelist_defaults>
12 changes: 9 additions & 3 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,10 +1807,14 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_16pfts_c241007.nc</fsurd
<!-- fsurdat files with 78 PFTS -->
<fsurdat hgrid="360x720cru" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_360x720cru_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
<fsurdat hgrid="0.9x1.25" sim_year="1850" cmip_era="cmip7">
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_0.9x1.25_hist_1850_78pfts_c250723.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true.">
<fsurdat hgrid="0.9x1.25" sim_year="1850" cmip_era="cmip6">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true." cmip_era="cmip7">
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_1.9x2.5_hist_1850_78pfts_c250723.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true." cmip_era="cmip6">
-lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="1850" use_crop=".true.">
Expand All @@ -1825,8 +1829,10 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_1850_78pfts_c240908.nc</
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
<fsurdat hgrid="ne30np4.pg3" sim_year="1850" cmip_era="cmip7">
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c250723.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg3" sim_year="1850" cmip_era="cmip6">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4" sim_year="1850">
Expand Down
6 changes: 6 additions & 0 deletions bld/namelist_files/namelist_definition_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,6 +2364,12 @@ A sim_year_range of 1000-1002 or 1000-1004 corresponds to data used for testing
A sim_year_range that goes beyond 2005 corresponds to historical data until 2005 and then scenario data beyond that point.
</entry>

<entry id="cmip_era" type="char*5" category="default_settings"
group="default_settings" valid_values="cmip6,cmip7">
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.
</entry>

<entry id="clm_demand" type="char*256" category="default_settings"
group="default_settings" valid_values="">
Namelist entries to demand be provided on the namelist.
Expand Down
14 changes: 14 additions & 0 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,20 @@
This is typically set by the compset.</desc>
</entry>

<entry id="CLM_CMIP_ERA" >
<type>char</type>
<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.</desc>
</entry>

<entry id="LND_SETS_DUST_EMIS_DRV_FLDS">
<!-- See https://github.com/ESCOMP/CTSM/issues/2713 we plan to phase this out -->
<type>logical</type>
Expand Down
Loading