Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content
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

Jump to bottom

Get FATES working for NEON #1613

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Get FATES working for NEON #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4243379
Add FATES single point tower compset
ekluzek Jan 24, 2022
e0a213d
Add new NEON and 2018/Present-day use-cases
ekluzek Jan 25, 2022
b145443
Handel most NEON settings use the new 2018-PD_NOEN_transient use case
ekluzek Jan 25, 2022
a30beb3
For NEON set the 2018-PD_NEON_transient use-case and remove the setti…
ekluzek Jan 25, 2022
63d8009
Add a FATES and SP NEON test
ekluzek Jan 26, 2022
a78661a
Put just the common variables for SP cases, and add a commented out n…
ekluzek Jan 27, 2022
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
12 changes: 6 additions & 6 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,12 +3393,12 @@ sub setup_logic_nitrogen_deposition {
'sim_year_range'=>$nl_flags->{'sim_year_range'});
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
'use_cn'=>$nl_flags->{'use_cn'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
'hgrid'=>"0.9x1.25", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
# Also check at f19 resolution
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
'use_cn'=>$nl_flags->{'use_cn'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
# If not found report an error
if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
Expand Down Expand Up @@ -3620,7 +3620,7 @@ sub setup_logic_lightning_streams {
'sim_year_range'=>$nl_flags->{'sim_year_range'});
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_lightng',
'hgrid'=>$nl_flags->{'light_res'} );
'hgrid'=>$nl_flags->{'light_res'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'} );
if ($opts->{'driver'} eq "nuopc" ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_meshfile_lightng',
'hgrid'=>$nl_flags->{'light_res'} );
Expand Down Expand Up @@ -4523,8 +4523,8 @@ sub check_use_case_name {
"in namelist_files/use_cases/README\n";
my $desc = "[a-zA-Z0-9]*";
my $ssp_rcp = "SSP[0-9]-[0-9\.]+";
if ( $use_case =~ /^[0-9]+-[0-9]+([a-zA-Z0-9_\.-]*)_transient$/ ) {
my $string = $1;
if ( $use_case =~ /^[0-9]+-(PD|[0-9]+)([a-zA-Z0-9_\.-]*)_transient$/ ) {
my $string = $2;
if ( $string =~ /^_($ssp_rcp)_*($desc)$/ ) {
# valid name
} elsif ( $string =~ /^_*($desc)$/ ) {
Expand All @@ -4541,7 +4541,7 @@ sub check_use_case_name {
} else {
$log->fatal_error($diestring);
}
} elsif ( $use_case =~ /^([0-9]+)_*($desc)_control$/ ) {
} elsif ( $use_case =~ /^(PD|[0-9]+)_*($desc)_control$/ ) {
# valid name
} elsif ( $use_case =~ /^($desc)_pd$/ ) {
# valid name
Expand Down
68 changes: 68 additions & 0 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 @@ -25,6 +25,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<co2_ppmv sim_year="2000" >379.0</co2_ppmv>
<co2_ppmv sim_year="2010" >388.8</co2_ppmv>
<co2_ppmv sim_year="2015" >397.5</co2_ppmv>
<co2_ppmv sim_year="2018" >408.83</co2_ppmv> <!-- From SSP3-7.0 scenario -->
<co2_ppmv sim_year="2020" >415.15</co2_ppmv> <!-- From SSP3-7.0 scenario -->
<co2_ppmv sim_year="PD" >415.15</co2_ppmv>
<co2_ppmv sim_year="1850" >284.7</co2_ppmv>
<co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>

Expand Down Expand Up @@ -125,9 +128,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- Irrigation default -->
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false." sim_year_range="1850-2100">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." sim_year_range="1850-2100">.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".false." sim_year_range="2018-PD" >.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_1" use_cndv=".true." sim_year_range="2018-PD" >.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false." sim_year_range="1850-2100">.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." sim_year_range="1850-2100">.false.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".false." sim_year_range="2018-PD" >.true.</irrigate>
<irrigate use_crop=".true." phys="clm5_0" use_cndv=".true." sim_year_range="2018-PD" >.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" sim_year_range="1850-2100">.false.</irrigate>
<irrigate use_crop=".true." phys="clm4_5" sim_year_range="2018-PD" >.false.</irrigate>

<irrigate use_crop=".true." >.false.</irrigate>
<irrigate use_crop=".false.">.true.</irrigate>
Expand Down Expand Up @@ -1450,6 +1458,10 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_first_ndep phys="clm4_5" use_cn=".true." sim_year_range="1850-2100" >2015</stream_year_first_ndep>
<stream_year_last_ndep phys="clm4_5" use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
<model_year_align_ndep phys="clm4_5" use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>
<stream_year_first_ndep use_cn=".true." sim_year_range="2018-PD" >2018</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year_range="2018-PD" >2020</stream_year_last_ndep>
<model_year_align_ndep use_cn=".true." sim_year_range="2018-PD" >2018</model_year_align_ndep>


<stream_year_first_ndep phys="clm5_0" use_cn=".true." sim_year_range="1850-2100" >2015</stream_year_first_ndep>
<stream_year_last_ndep phys="clm5_0" use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
Expand All @@ -1459,6 +1471,15 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_last_ndep phys="clm5_1" use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
<model_year_align_ndep phys="clm5_1" use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>

<stream_year_first_ndep use_cn=".true." sim_year="PD" >2020</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year="PD" >2020</stream_year_last_ndep>

<stream_year_first_ndep use_cn=".true." sim_year="2020" >2020</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year="2020" >2020</stream_year_last_ndep>

<stream_year_first_ndep use_cn=".true." sim_year="2018" >2018</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year="2018" >2018</stream_year_last_ndep>

<stream_year_first_ndep use_cn=".true." sim_year="2010" >2010</stream_year_first_ndep>
<stream_year_last_ndep use_cn=".true." sim_year="2010" >2010</stream_year_last_ndep>

Expand Down Expand Up @@ -1512,6 +1533,14 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0"
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>

<!-- NEON data (just a reduced range of the data) -->
<stream_fldfilename_ndep phys="clm4_5" sim_year_range="2018-PD" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0">
lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm5_0" sim_year_range="2018-PD" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0">
lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm5_1" sim_year_range="2018-PD" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0">
lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc</stream_fldfilename_ndep>

<ndep_taxmode phys="clm5_1" use_cn=".true.">cycle</ndep_taxmode>
<ndep_varlist phys="clm5_1" use_cn=".true.">NDEP_month</ndep_varlist>

Expand Down Expand Up @@ -1589,6 +1618,10 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_fldfilename_lightng hgrid="360x720" >atm/datm7/NASA_LIS/clmforc.Li_2016_climo1995-2013.360x720.lnfm_Total_c160825.nc</stream_fldfilename_lightng>
<stream_meshfile_lightng hgrid="360x720" >atm/datm7/NASA_LIS/clmforc.Li_2016_climo1995-2013.360x720_ESMFmesh_cdf5_150621.nc</stream_meshfile_lightng>

<!-- NEON data (just a reduced range of the data) -->
<stream_fldfilename_lightng sim_year_range="2018-PD" hgrid="360x720">
atm/datm7/NASA_LIS/clmforc.Li_2016_climo1995-2013.360x720.lnfm_Total_NEONarea_c210625.nc</stream_fldfilename_lightng>

<lightngmapalgo >bilinear</lightngmapalgo>

<lightngmapalgo hgrid="1x1_brazil" >nn</lightngmapalgo>
Expand All @@ -1602,6 +1635,10 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_first_popdens phys="clm4_5" cnfireson=".true." sim_year_range="1850-2100" >2015</stream_year_first_popdens>
<stream_year_last_popdens phys="clm4_5" cnfireson=".true." sim_year_range="1850-2100" >2100</stream_year_last_popdens>
<model_year_align_popdens phys="clm4_5" cnfireson=".true." sim_year_range="1850-2100" >2015</model_year_align_popdens>
<stream_year_first_popdens cnfireson=".true." sim_year_range="2018-PD" >2018</stream_year_first_popdens>
<stream_year_last_popdens cnfireson=".true." sim_year_range="2018-PD" >2020</stream_year_last_popdens>
<model_year_align_popdens cnfireson=".true." sim_year_range="2018-PD" >2018</model_year_align_popdens>


<stream_year_first_popdens phys="clm5_0" cnfireson=".true." sim_year_range="1850-2100" >2015</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." sim_year_range="1850-2100" >2100</stream_year_last_popdens>
Expand All @@ -1611,6 +1648,15 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_last_popdens phys="clm5_1" cnfireson=".true." sim_year_range="1850-2100" >2100</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_1" cnfireson=".true." sim_year_range="1850-2100" >2015</model_year_align_popdens>

<stream_year_first_popdens use_cn=".true." sim_year="PD" >2020</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="PD" >2020</stream_year_last_popdens>

<stream_year_first_popdens use_cn=".true." sim_year="2020" >2020</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="2020" >2020</stream_year_last_popdens>

<stream_year_first_popdens use_cn=".true." sim_year="2018" >2018</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="2018" >2018</stream_year_last_popdens>

<stream_year_first_popdens use_cn=".true." sim_year="2010" >2010</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="2010" >2010</stream_year_last_popdens>

Expand All @@ -1629,6 +1675,15 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_first_popdens use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_popdens>
<stream_year_last_popdens use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_popdens>

<stream_year_first_popdens use_fates=".true." sim_year="PD" >2020</stream_year_first_popdens>
<stream_year_last_popdens use_fates=".true." sim_year="PD" >2020</stream_year_last_popdens>

<stream_year_first_popdens use_fates=".true." sim_year="2020" >2020</stream_year_first_popdens>
<stream_year_last_popdens use_fates=".true." sim_year="2020" >2020</stream_year_last_popdens>

<stream_year_first_popdens use_fates=".true." sim_year="2018" >2018</stream_year_first_popdens>
<stream_year_last_popdens use_fates=".true." sim_year="2018" >2018</stream_year_last_popdens>

<stream_year_first_popdens use_fates=".true." sim_year="2010" >2010</stream_year_first_popdens>
<stream_year_last_popdens use_fates=".true." sim_year="2010" >2010</stream_year_last_popdens>

Expand Down Expand Up @@ -1707,6 +1762,10 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_first_urbantv phys="clm5_1" sim_year_range="1850-2100" >2015</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_1" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_1" sim_year_range="1850-2100" >2015</model_year_align_urbantv>
<stream_year_first_urbantv sim_year_range="2018-PD" >2018</stream_year_first_urbantv>
<stream_year_last_urbantv sim_year_range="2018-PD" >2020</stream_year_last_urbantv>
<model_year_align_urbantv sim_year_range="2018-PD" >2018</model_year_align_urbantv>


<stream_year_first_urbantv phys="clm5_0" sim_year_range="1850-2100" >2015</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
Expand All @@ -1716,6 +1775,15 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<stream_year_last_urbantv phys="clm4_5" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" sim_year_range="1850-2100" >2015</model_year_align_urbantv>

<stream_year_first_urbantv sim_year="PD" >2020</stream_year_first_urbantv>
<stream_year_last_urbantv sim_year="PD" >2020</stream_year_last_urbantv>

<stream_year_first_urbantv sim_year="2020" >2020</stream_year_first_urbantv>
<stream_year_last_urbantv sim_year="2020" >2020</stream_year_last_urbantv>

<stream_year_first_urbantv sim_year="2018" >2018</stream_year_first_urbantv>
<stream_year_last_urbantv sim_year="2018" >2018</stream_year_last_urbantv>

<stream_year_first_urbantv sim_year="2000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv sim_year="2000" >2000</stream_year_last_urbantv>

Expand Down
8 changes: 5 additions & 3 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 @@ -2031,22 +2031,24 @@ If 1, turn on the MEGAN model for BVOC's (Biogenic Volitile Organic Compounds)

<entry id="sim_year" type="char*4" category="default_settings"
group="default_settings" valid_values=
"PtVg,1000,850,1100,1350,1600,1850,1855,1865,1875,1885,1895,1905,1915,1925,1935,1945,1955,1965,1975,1979,1980,1982,1985,1995,2000,2005,2010,2013,2015,2025,2035,2045,2055,2065,2075,2085,2095,2105">
"PtVg,1000,850,1100,1350,1600,1850,1855,1865,1875,1885,1895,1905,1915,1925,1935,1945,1955,1965,1975,1979,1980,1982,1985,1995,2000,2005,2010,2013,2015,2018,2020,2025,2035,2045,2055,2065,2075,2085,2095,2105,PD">
Year to simulate and to provide datasets for (such as surface datasets, initial conditions, aerosol-deposition, Nitrogen deposition rates etc.)
A sim_year of 1000 corresponds to data used for testing only, NOT corresponding to any real datasets.
A sim_year greater than 2015 corresponds to ssp_rcp scenario data
A sim_year of PtVg refers to the Potential Vegetation dataset, that doesn't include human influences
A sim_year of PD refers to Present Day (which will be moved forward as new NEON data is available)
Most years are only used for clm_tools and there aren't CLM datasets that correspond to them.
CLM datasets exist for years: 1000 (for testing), 1850, and 2000
</entry>

<entry id="sim_year_range" type="char*9" category="default_settings"
group="default_settings" valid_values=
"constant,1000-1002,1000-1004,850-1850,1850-1855,1850-2000,1850-2005,1850-2100,1980-2015,2000-2025,2000-2100">
"constant,1000-1002,1000-1004,850-1850,1850-1855,1850-2000,1850-2005,1850-2100,1980-2015,2000-2025,2018-PD,2000-2100">
Range of years to simulate transitory datasets for (such as dynamic: land-use datasets, aerosol-deposition, Nitrogen deposition rates etc.)
Constant means simulation will be held at a constant year given in sim_year.
A sim_year_range of 1000-1002 or 1000-1004 corresponds to data used for testing only, NOT corresponding to any real datasets.
A sim_year_range that goes beyond 2005 corresponds to historical data until 2005 and then scenario data beyond that point.
A sim_year_range that goes beyond 2015 corresponds to historical data until 2015 and then scenario data beyond that point.
A sim_year_range that ends on PD means ending on Present-Day which will be moved forward as NEON data is available.
</entry>

<entry id="clm_demand" type="char*256" category="default_settings"
Expand Down
23 changes: 23 additions & 0 deletions bld/namelist_files/use_cases/2018-PD_NEON_transient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0"?>

<namelist_defaults>

<use_case_desc >Simulate transient land-use, and aerosol deposition changes from 2018 to current day with historical NEON data, also using data from CMIP6 SSP3-7.0 scenario for data not currently available</use_case_desc>
<use_case_desc use_cn=".true." >Simulate transient land-use, aerosol, and nitrogen deposition changes from 2018 to current day with historical NEON data, also using data from CMIP6 SSP3-7.0 scenario for data not currently available</use_case_desc>

<!-- Have a minimal list of things set here, sim_year, sim_year_range, and ssp_rcp, other things should be dependent on these and
set in a namelist_defaults xml file -->

<sim_year>2018</sim_year>

<sim_year_range>2018-PD</sim_year_range>

<!-- For now use cycle for transient cases until CDEPS issue 201 is resolved
<ndep_taxmode use_cn=".true." >limit</ndep_taxmode>
-->

<!-- For datasets where wer don't have recent data, use the CMIP6 future scenario for SSP-RCP SSP3-7.0 to fill in. This is needed
for example for aerosol and nitrogen deposition -->
<ssp_rcp>SSP3-7.0</ssp_rcp>

</namelist_defaults>
11 changes: 11 additions & 0 deletions bld/namelist_files/use_cases/2018_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>

<namelist_defaults>

<use_case_desc>Conditions to simulate 2018</use_case_desc>

<sim_year>2018</sim_year>

<sim_year_range>constant</sim_year_range>

</namelist_defaults>
11 changes: 11 additions & 0 deletions bld/namelist_files/use_cases/PD_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>

<namelist_defaults>

<use_case_desc>Conditions to simulate Present-Day (specific year will gradually move forward as data is available)</use_case_desc>

<sim_year>PD</sim_year>

<sim_year_range>constant</sim_year_range>

</namelist_defaults>
2 changes: 1 addition & 1 deletion bld/unit_testers/build-namelist_test.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ sub cat_and_create_namelistinfile {
#
# Now run the site
#
my $options = "-res CLM_USRDAT -clm_usr_name NEON -no-megan -bgc bgc -sim_year 2000 -infile $namelistfile";
my $options = "-res CLM_USRDAT -clm_usr_name NEON -no-megan -bgc bgc -use_case 2018-PD_NEON_transient -infile $namelistfile";
eval{ system( "$bldnml -envxml_dir . $options > $tempfile 2>&1 " ); };
is( $@, '', "options: $options" );
$cfiles->checkfilesexist( "$options", $mode );
Expand Down
5 changes: 5 additions & 0 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
<lname>2000_DATM%1PT_CLM51%BGC_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>I1PtClm51Fates</alias>
<lname>2000_DATM%1PT_CLM51%FATES_SICE_SOCN_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>IHist1PtClm51Bgc</alias>
<lname>HIST_DATM%1PT_CLM51%BGC_SICE_SOCN_SROF_SGLC_SWAV</lname>
Expand Down
20 changes: 20 additions & 0 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1620,6 +1620,26 @@
<option name="comment" >Add at least one test of a NEON site</option>
</options>
</test>
<test name="SMS_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51Fates" testmods="clm/default--clm/NEON/ABBY">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="tput_tolerance">0.5</option>
<option name="comment" >Add at least one test of a NEON site for FATES</option>
</options>
</test>
<test name="SMS_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51SpRs" testmods="clm/default--clm/NEON/RMNP">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="tput_tolerance">0.5</option>
<option name="comment" >Add at least one test of a NEON site for SP</option>
</options>
</test>
<test name="SMS_D_Vmct_Lm1_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm50SpRs" testmods="clm/USUMB_mct">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
Expand Down
Loading