Skip to content

New F compset for cam4; updates to CAM testing. #1331

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

Open
wants to merge 8 commits into
base: cam_development
Choose a base branch
from
+192 −600
Open

New F compset for cam4; updates to CAM testing. #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a635ff1
update default pes for mpasa120 on derecho
brian-eaton Jun 5, 2025
d0ebaf8
remove unused testmods outfrq3s_refined
brian-eaton Jun 9, 2025
1f5fd2e
test updates
brian-eaton Jun 11, 2025
09ca7c5
update ChangeLog
brian-eaton Jun 11, 2025
82936a2
update to cam6_4_097
brian-eaton Jun 19, 2025
d4ec9b1
add FHIST_C4
brian-eaton Jun 19, 2025
ec7bbf8
refactor setting stream_ndep_year_* variables
brian-eaton Jun 19, 2025
965ddac
testing updates
brian-eaton Jun 19, 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
21 changes: 10 additions & 11 deletions bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,6 @@ if ($analytic_ic) {
add_default($nl, 'analytic_ic_type');
}

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

# sim_year_start
# If sim_year is input as a range of years, then select the first year
# to use with some datasets
my $sim_year_start = $sim_year;
# If sim_year is input as a range of years, then extract the first and last years
my $sim_year_first = $sim_year;
my $sim_year_last = $sim_year;
my $sim_year_align = '1';
if ($sim_year =~ /(\d+)-(\d+)/) {
$sim_year_start = $1;
$sim_year_first = $1;
$sim_year_last = $2;
$sim_year_align = $1;
}

# Setup default ndep streams only if not simple_phys or aqua_mode and
Expand All @@ -704,9 +703,9 @@ if (!($simple_phys or $aqua_mode)) {
if ((!$chem_nitrodep) or ($chem =~ /geoschem/)) {
add_default($nl, 'stream_ndep_mesh_filename');
add_default($nl, 'stream_ndep_data_filename', 'sim_year'=>$sim_year);
add_default($nl, 'stream_ndep_year_first', 'sim_year'=>$sim_year);
add_default($nl, 'stream_ndep_year_last', 'sim_year'=>$sim_year);
add_default($nl, 'stream_ndep_year_align', 'sim_year'=>$sim_year);
add_default($nl, 'stream_ndep_year_first', 'val'=>$sim_year_first);
add_default($nl, 'stream_ndep_year_last', 'val'=>$sim_year_last);
add_default($nl, 'stream_ndep_year_align', 'val'=>$sim_year_align);
}
}

Expand Down
13 changes: 0 additions & 13 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,19 +2035,6 @@
<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>
<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>

<stream_ndep_year_first >2000</stream_ndep_year_first>
<stream_ndep_year_first sim_year="1850">1850</stream_ndep_year_first>
<stream_ndep_year_first sim_year="1850-2015">1850</stream_ndep_year_first>
<stream_ndep_year_first sim_year="2010">2010</stream_ndep_year_first>

<stream_ndep_year_last >2000</stream_ndep_year_last>
<stream_ndep_year_last sim_year="1850">1850</stream_ndep_year_last>
<stream_ndep_year_last sim_year="1850-2015">2015</stream_ndep_year_last>
<stream_ndep_year_last sim_year="2010">2010</stream_ndep_year_last>

<stream_ndep_year_align >1</stream_ndep_year_align>
<stream_ndep_year_align sim_year="1850-2015">1850</stream_ndep_year_align>

<!-- Turbulent Mountain Stress -->
<do_tms > .false. </do_tms>
<do_tms waccm_phys="1" phys="cam4" > .true. </do_tms>
Expand Down
35 changes: 35 additions & 0 deletions bld/namelist_files/use_cases/1850-2005_cam4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0"?>

<namelist_defaults>

<!-- TSI dataset from Lean (via Caspar Ammann) -->
<solar_data_file>atm/cam/solar/SOLAR_TSI_Lean_1610-2007_annual_c090324.nc</solar_data_file>

<!-- GHG values from AR5 PRE2005_MIDYR_CONC.DAT (via Jean-Francois Lamarque) -->
<scenario_ghg>RAMPED</scenario_ghg>
<bndtvghg>atm/cam/ggas/ghg_hist_1765-2005_c091218.nc</bndtvghg>

<!-- Prescribed BAM data is from Jean-Francois Lamarque -->
<prescribed_aero_datapath>atm/cam/chem/trop_mozart_aero/aero</prescribed_aero_datapath>
<prescribed_aero_file>aero_1.9x2.5_L26_1850-2005_c091112.nc</prescribed_aero_file>
<prescribed_aero_type>INTERP_MISSING_MONTHS</prescribed_aero_type>

<!-- aerosol deposition -->
<aerodep_flx_datapath>atm/cam/chem/trop_mozart_aero/aero</aerodep_flx_datapath>
<aerodep_flx_file>aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc</aerodep_flx_file>
<aerodep_flx_type>INTERP_MISSING_MONTHS</aerodep_flx_type>

<!-- Prescribed ozone data is from Jean-Francois Lamarque -->
<prescribed_ozone_datapath>atm/cam/ozone</prescribed_ozone_datapath>
<prescribed_ozone_file>ozone_1.9x2.5_L26_1850-2005_c091112.nc</prescribed_ozone_file>
<prescribed_ozone_name>O3</prescribed_ozone_name>
<prescribed_ozone_type>INTERP_MISSING_MONTHS</prescribed_ozone_type>

<!-- Volcanic aerosol from eruptions is from Caspar Ammann -->
<prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
<prescribed_volcaero_file>CCSM4_volcanic_1850-2008_prototype1.nc</prescribed_volcaero_file>

<!-- sim_year attribute used for nitrogen deposition datasets -->
<sim_year>1850-2015</sim_year>

</namelist_defaults>
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 @@ -298,6 +298,11 @@
<!-- CAM tested compsets -->
<!-- ****************************** -->

<compset>
<alias>FHIST_C4</alias>
<lname>HIST_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>F2010climo</alias>
<lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
Expand Down
Loading