Skip to content

Commit fe0fa29

Browse files
ekluzekekluzek
authored
Merge pull request #1872 from wwieder/neon_updates
Neon updates
2 parents 979c71f + 01b4118 commit fe0fa29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+853
-713
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ unit_test_build
105105
/tools/mkmapdata/regrid.o*
106106
/tools/mkmapdata/map*.nc
107107

108+
# run_neon output directories
109+
/tools/site_and_regional/listing.csv
110+
/tools/site_and_regional/????/
111+
/tools/site_and_regional/????.ad/
112+
/tools/site_and_regional/????.postad/
113+
/tools/site_and_regional/????.transient/
114+
108115
# build output
109116
*.o
110117
*.mod

‎Externals.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ required = True
2323
local_path = components/mosart
2424
protocol = git
2525
repo_url = https://github.com/ESCOMP/MOSART
26-
tag = mosart1_0_45
26+
tag = mosart1_0_47
2727
required = True
2828

2929
[mizuRoute]

‎bld/CLMBuildNamelist.pm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4560,6 +4560,8 @@ sub check_use_case_name {
45604560
} else {
45614561
$log->fatal_error($diestring);
45624562
}
4563+
} elsif ( $use_case =~ /^([0-9]+|PI)-PD_*($desc)_transient$/ ) {
4564+
# valid name
45634565
} elsif ( $use_case =~ /^([0-9]+)_*($desc)_control$/ ) {
45644566
# valid name
45654567
} elsif ( $use_case =~ /^($desc)_pd$/ ) {

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
2525
<co2_ppmv sim_year="2000" >379.0</co2_ppmv>
2626
<co2_ppmv sim_year="2010" >388.8</co2_ppmv>
2727
<co2_ppmv sim_year="2015" >397.5</co2_ppmv>
28+
<co2_ppmv sim_year="2018" >408.83</co2_ppmv>
2829
<co2_ppmv sim_year="1850" >284.7</co2_ppmv>
2930
<co2_ppmv sim_year="PtVg" >284.7</co2_ppmv>
3031

@@ -1449,6 +1450,9 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
14491450
<stream_year_last_ndep phys="clm5_1" use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
14501451
<model_year_align_ndep phys="clm5_1" use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>
14511452

1453+
<stream_year_first_ndep use_cn=".true." sim_year="2018" >2018</stream_year_first_ndep>
1454+
<stream_year_last_ndep use_cn=".true." sim_year="2018" >2018</stream_year_last_ndep>
1455+
14521456
<stream_year_first_ndep use_cn=".true." sim_year="2010" >2010</stream_year_first_ndep>
14531457
<stream_year_last_ndep use_cn=".true." sim_year="2010" >2010</stream_year_last_ndep>
14541458

@@ -1601,6 +1605,9 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
16011605
<stream_year_last_popdens phys="clm5_1" cnfireson=".true." sim_year_range="1850-2100" >2100</stream_year_last_popdens>
16021606
<model_year_align_popdens phys="clm5_1" cnfireson=".true." sim_year_range="1850-2100" >2015</model_year_align_popdens>
16031607

1608+
<stream_year_first_popdens use_cn=".true." sim_year="2018" >2018</stream_year_first_popdens>
1609+
<stream_year_last_popdens use_cn=".true." sim_year="2018" >2018</stream_year_last_popdens>
1610+
16041611
<stream_year_first_popdens use_cn=".true." sim_year="2010" >2010</stream_year_first_popdens>
16051612
<stream_year_last_popdens use_cn=".true." sim_year="2010" >2010</stream_year_last_popdens>
16061613

@@ -1619,6 +1626,9 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
16191626
<stream_year_first_popdens use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_popdens>
16201627
<stream_year_last_popdens use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_popdens>
16211628

1629+
<stream_year_first_popdens use_fates=".true." sim_year="2018" >2018</stream_year_first_popdens>
1630+
<stream_year_last_popdens use_fates=".true." sim_year="2018" >2018</stream_year_last_popdens>
1631+
16221632
<stream_year_first_popdens use_fates=".true." sim_year="2010" >2010</stream_year_first_popdens>
16231633
<stream_year_last_popdens use_fates=".true." sim_year="2010" >2010</stream_year_last_popdens>
16241634

@@ -1706,6 +1716,12 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
17061716
<stream_year_last_urbantv phys="clm4_5" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
17071717
<model_year_align_urbantv phys="clm4_5" sim_year_range="1850-2100" >2015</model_year_align_urbantv>
17081718

1719+
<stream_year_first_urbantv sim_year="2018" >2018</stream_year_first_urbantv>
1720+
<stream_year_last_urbantv sim_year="2018" >2018</stream_year_last_urbantv>
1721+
1722+
<stream_year_first_urbantv sim_year="2010" >2010</stream_year_first_urbantv>
1723+
<stream_year_last_urbantv sim_year="2010" >2010</stream_year_last_urbantv>
1724+
17091725
<stream_year_first_urbantv sim_year="2000" >2000</stream_year_first_urbantv>
17101726
<stream_year_last_urbantv sim_year="2000" >2000</stream_year_last_urbantv>
17111727

‎bld/namelist_files/namelist_definition_ctsm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,7 @@ If 1, turn on the MEGAN model for BVOC's (Biogenic Volitile Organic Compounds)
20572057

20582058
<entry id="sim_year" type="char*4" category="default_settings"
20592059
group="default_settings" valid_values=
2060-
"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">
2060+
"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,2025,2035,2045,2055,2065,2075,2085,2095,2105">
20612061
Year to simulate and to provide datasets for (such as surface datasets, initial conditions, aerosol-deposition, Nitrogen deposition rates etc.)
20622062
A sim_year of 1000 corresponds to data used for testing only, NOT corresponding to any real datasets.
20632063
A sim_year greater than 2015 corresponds to ssp_rcp scenario data

‎bld/namelist_files/use_cases/2018-PD_transient.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<use_case_desc>Simulate transient land-use, and aerosol deposition changes from 2018 to current day with a mix of historical data, and future scenario data</use_case_desc>
6+
7+
<!-- Have a minimal list of things set here, sim_year, sim_year_range, and ssp_rcp, other things should be dependent on these and
8+
set in a namelist_defaults xml file -->
9+
10+
<sim_year>2018</sim_year>
11+
12+
<sim_year_range>1850-2100</sim_year_range>
13+
14+
<!-- Use future data as needed from the SSP3-7.0 scenario-->
15+
<ssp_rcp>SSP3-7.0</ssp_rcp>
16+
17+
<stream_year_first_ndep use_cn=".true." >2018</stream_year_first_ndep>
18+
<stream_year_last_ndep use_cn=".true." >2022</stream_year_last_ndep>
19+
<model_year_align_ndep use_cn=".true." >2018</model_year_align_ndep>
20+
21+
<stream_year_first_popdens cnfireson=".true." >2018</stream_year_first_popdens>
22+
<stream_year_last_popdens cnfireson=".true." >2022</stream_year_last_popdens>
23+
<model_year_align_popdens cnfireson=".true." >2018</model_year_align_popdens>
24+
25+
<stream_year_first_urbantv >2018</stream_year_first_urbantv>
26+
<stream_year_last_urbantv >2022</stream_year_last_urbantv>
27+
<model_year_align_urbantv >2018</model_year_align_urbantv>
28+
29+
</namelist_defaults>

‎bld/namelist_files/use_cases/2018_control.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<use_case_desc>Conditions to simulate 2018 land-use</use_case_desc>
6+
7+
<sim_year>2018</sim_year>
8+
9+
<sim_year_range>constant</sim_year_range>
10+
11+
<!-- Use future data as needed from the SSP3-7.0 scenario-->
12+
<ssp_rcp>SSP3-7.0</ssp_rcp>
13+
14+
</namelist_defaults>

‎bld/namelist_files/use_cases/README‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Transient cases:
1717

1818
20thC$desc_transient (means nominal 1850-2000 although some datasets are 1850-2005)
1919

20+
or
21+
22+
yyyy-PD_$desc_transient (means nominal year yyyy through present day (PD) (with the year for PD advancing)
23+
2024
Control cases:
2125

2226
yyyy$desc_control
@@ -30,6 +34,7 @@ Where
3034

3135
yyyy = Simulation year (such as 1850 or 2000).
3236
yyyy-yyyy = Range of simulation years to run over (i.e.. 1850-2000).
37+
yyyy-PD = Range of simulation years to run over until present day (i.e.. 2018-2024).
3338
$ssp_rcp = Shared Socieconomic Pathway (SSP) Representative concentration pathway (RCP) description string
3439
for future scenarios:
3540
SSP#-#.# (for example: SSP5-8.5, SSP1-2.6, SSP4-6.0

‎bld/unit_testers/build-namelist_test.pl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ sub cat_and_create_namelistinfile {
393393
#
394394
# Now run the site
395395
#
396-
my $options = "-res CLM_USRDAT -clm_usr_name NEON -no-megan -bgc bgc -sim_year 2000 -infile $namelistfile";
396+
my $options = "-res CLM_USRDAT -clm_usr_name NEON -no-megan -bgc bgc -sim_year 2018 -infile $namelistfile";
397397
eval{ system( "$bldnml -envxml_dir . $options > $tempfile 2>&1 " ); };
398398
is( $@, '', "options: $options" );
399399
$cfiles->checkfilesexist( "$options", $mode );

‎cime_config/config_component.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,11 @@
290290

291291
<entry id="NEONSITE">
292292
<type>char</type>
293+
<!-- NOTE: Be sure to have a comma at the last site-name - otherwise there will be issues see CTSM github issue #1901 -->
293294
<valid_values>
294295
ABBY,BLAN,CPER,DEJU,GRSM,HEAL,KONA,LENO,NIWO,ONAQ,PUUM,SERC,SRER,TALL,TREE,WOOD,
295296
BARR,BONA,DCFS,DELA,GUAN,JERC,KONZ,MLBS,NOGP,ORNL,RMNP,SJER,STEI,TEAK,UKFS,WREF,
296-
BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL
297+
BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL,
297298
</valid_values>
298299
<default_value/>
299300
<group>run_component_ctsm</group>

0 commit comments

Comments
 (0)