Skip to content

Commit 386175d

Browse files
brian-eatonbrian-eaton
authored
Merge pull request #1331 from brian-eaton/tests04
cam6_4_099: New F compset for cam4; updates to CAM testing.
2 parents c4abe78 + e77d46c commit 386175d

12 files changed

Lines changed: 239 additions & 611 deletions

File tree

‎bld/build-namelist‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,6 @@ if ($analytic_ic) {
676676
add_default($nl, 'analytic_ic_type');
677677
}
678678

679-
#
680-
# Simulated years: sim_year and sim_year_start
681-
#
682679
# sim_year
683680
# This is used to identify appropriate defaults for climatological or transient
684681
# forcing datasets. If user hasn't specified then default to 2000 (present day climatology).
@@ -689,12 +686,14 @@ if (defined $nl->get_value('sim_year')) {
689686
$sim_year =~ s/['"]//g; #"'
690687
}
691688

692-
# sim_year_start
693-
# If sim_year is input as a range of years, then select the first year
694-
# to use with some datasets
695-
my $sim_year_start = $sim_year;
689+
# If sim_year is input as a range of years, then extract the first and last years
690+
my $sim_year_first = $sim_year;
691+
my $sim_year_last = $sim_year;
692+
my $sim_year_align = '1';
696693
if ($sim_year =~ /(\d+)-(\d+)/) {
697-
$sim_year_start = $1;
694+
$sim_year_first = $1;
695+
$sim_year_last = $2;
696+
$sim_year_align = $1;
698697
}
699698

700699
# Setup default ndep streams only if not simple_phys or aqua_mode and
@@ -704,9 +703,9 @@ if (!($simple_phys or $aqua_mode)) {
704703
if ((!$chem_nitrodep) or ($chem =~ /geoschem/)) {
705704
add_default($nl, 'stream_ndep_mesh_filename');
706705
add_default($nl, 'stream_ndep_data_filename', 'sim_year'=>$sim_year);
707-
add_default($nl, 'stream_ndep_year_first', 'sim_year'=>$sim_year);
708-
add_default($nl, 'stream_ndep_year_last', 'sim_year'=>$sim_year);
709-
add_default($nl, 'stream_ndep_year_align', 'sim_year'=>$sim_year);
706+
add_default($nl, 'stream_ndep_year_first', 'val'=>$sim_year_first);
707+
add_default($nl, 'stream_ndep_year_last', 'val'=>$sim_year_last);
708+
add_default($nl, 'stream_ndep_year_align', 'val'=>$sim_year_align);
710709
}
711710
}
712711

‎bld/config_files/definition.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ Chemistry source directory generated by the chemistry preprocessor; contains F90
127127
<entry id="chem_src_dir" value="">
128128
Chemistry source directory; contains F90 files.
129129
</entry>
130-
<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom" value="docn">
130+
<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom,mpaso" value="docn">
131131
Use data ocean model (docn or dom), stub ocean (socn), or aqua planet ocean
132132
(aquaplanet) in cam build. When built from the CESM scripts the value of
133-
ocn may be set to pop. This doesn't impact how CAM is built, only how
133+
ocn may be set to pop, mom, or mpaso. This doesn't impact how CAM is built, only how
134134
attributes are matched when searching for namelist defaults. If ocn is set
135135
to som then the docn component is used.
136136
</entry>

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,19 +2035,6 @@
20352035
<stream_ndep_data_filename >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_ndep_data_filename>
20362036
<stream_ndep_data_filename sim_year="1850">lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_ndep_data_filename>
20372037

2038-
<stream_ndep_year_first >2000</stream_ndep_year_first>
2039-
<stream_ndep_year_first sim_year="1850">1850</stream_ndep_year_first>
2040-
<stream_ndep_year_first sim_year="1850-2015">1850</stream_ndep_year_first>
2041-
<stream_ndep_year_first sim_year="2010">2010</stream_ndep_year_first>
2042-
2043-
<stream_ndep_year_last >2000</stream_ndep_year_last>
2044-
<stream_ndep_year_last sim_year="1850">1850</stream_ndep_year_last>
2045-
<stream_ndep_year_last sim_year="1850-2015">2015</stream_ndep_year_last>
2046-
<stream_ndep_year_last sim_year="2010">2010</stream_ndep_year_last>
2047-
2048-
<stream_ndep_year_align >1</stream_ndep_year_align>
2049-
<stream_ndep_year_align sim_year="1850-2015">1850</stream_ndep_year_align>
2050-
20512038
<!-- Turbulent Mountain Stress -->
20522039
<do_tms > .false. </do_tms>
20532040
<do_tms waccm_phys="1" phys="cam4" > .true. </do_tms>

‎bld/namelist_files/use_cases/1850-2005_cam4.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<!-- TSI dataset from Lean (via Caspar Ammann) -->
6+
<solar_data_file>atm/cam/solar/SOLAR_TSI_Lean_1610-2007_annual_c090324.nc</solar_data_file>
7+
8+
<!-- GHG values from AR5 PRE2005_MIDYR_CONC.DAT (via Jean-Francois Lamarque) -->
9+
<scenario_ghg>RAMPED</scenario_ghg>
10+
<bndtvghg>atm/cam/ggas/ghg_hist_1765-2005_c091218.nc</bndtvghg>
11+
12+
<!-- Prescribed BAM data is from Jean-Francois Lamarque -->
13+
<prescribed_aero_datapath>atm/cam/chem/trop_mozart_aero/aero</prescribed_aero_datapath>
14+
<prescribed_aero_file>aero_1.9x2.5_L26_1850-2005_c091112.nc</prescribed_aero_file>
15+
<prescribed_aero_type>INTERP_MISSING_MONTHS</prescribed_aero_type>
16+
17+
<!-- aerosol deposition -->
18+
<aerodep_flx_datapath>atm/cam/chem/trop_mozart_aero/aero</aerodep_flx_datapath>
19+
<aerodep_flx_file>aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc</aerodep_flx_file>
20+
<aerodep_flx_type>INTERP_MISSING_MONTHS</aerodep_flx_type>
21+
22+
<!-- Prescribed ozone data is from Jean-Francois Lamarque -->
23+
<prescribed_ozone_datapath>atm/cam/ozone</prescribed_ozone_datapath>
24+
<prescribed_ozone_file>ozone_1.9x2.5_L26_1850-2005_c091112.nc</prescribed_ozone_file>
25+
<prescribed_ozone_name>O3</prescribed_ozone_name>
26+
<prescribed_ozone_type>INTERP_MISSING_MONTHS</prescribed_ozone_type>
27+
28+
<!-- Volcanic aerosol from eruptions is from Caspar Ammann -->
29+
<prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
30+
<prescribed_volcaero_file>CCSM4_volcanic_1850-2008_prototype1.nc</prescribed_volcaero_file>
31+
32+
<!-- sim_year attribute used for nitrogen deposition datasets -->
33+
<sim_year>1850-2015</sim_year>
34+
35+
</namelist_defaults>

‎cime_config/config_compsets.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,11 @@
298298
<!-- CAM tested compsets -->
299299
<!-- ****************************** -->
300300

301+
<compset>
302+
<alias>FHIST_C4</alias>
303+
<lname>HIST_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
304+
</compset>
305+
301306
<compset>
302307
<alias>F2010climo</alias>
303308
<lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>

0 commit comments

Comments
 (0)