Skip to content

Commit e30e10d

Browse files
brian-eatonbrian-eaton
committed
merge to cam6_4_056
2 parents 5719f87 + ea101b3 commit e30e10d

File tree

116 files changed

+6645
-2895
lines changed

Some content is hidden

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

116 files changed

+6645
-2895
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
path = src/physics/carma/base
1010
url = https://github.com/ESCOMP/CARMA_base.git
1111
fxrequired = AlwaysRequired
12-
fxtag = carma4_01
12+
fxtag = carma4_09
1313
fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
1414

1515
[submodule "pumas"]
@@ -36,7 +36,7 @@
3636
[submodule "atmos_phys"]
3737
path = src/atmos_phys
3838
url = https://github.com/ESCOMP/atmospheric_physics
39-
fxtag = atmos_phys0_06_000
39+
fxtag = atmos_phys0_07_001
4040
fxrequired = AlwaysRequired
4141
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
4242

@@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
186186
[submodule "cice"]
187187
path = components/cice
188188
url = https://github.com/ESCOMP/CESM_CICE
189-
fxtag = cesm_cice6_5_0_12
189+
fxtag = cesm3_cice6_6_0_6
190190
fxrequired = ToplevelRequired
191191
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
192192

‎bld/build-namelist‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -509,14 +509,6 @@ if ($phys_mode_flags > 1) {
509509
my $simple_phys = 0;
510510
if ($adia_mode or $ideal_mode) { $simple_phys = 1; }
511511

512-
# If running either a simple physics or an aquaplanet configuration, the nitrogen
513-
# deposition data is not used. These files are set in buildnml and can't be overridden
514-
# via user_nl_cam. So provide an override here.
515-
if ($simple_phys or $aqua_mode) {
516-
$nl->set_variable_value('ndep_stream_nl', 'stream_ndep_data_filename', '" "');
517-
$nl->set_variable_value('ndep_stream_nl', 'stream_ndep_mesh_filename', '" "');
518-
}
519-
520512
# Single column mode
521513
my $scam = $cfg->get('scam');
522514
my $scam_iop = $cfg->get('scam_iop');
@@ -705,6 +697,19 @@ if ($sim_year =~ /(\d+)-(\d+)/) {
705697
$sim_year_start = $1;
706698
}
707699

700+
# Setup default ndep streams only if not simple_phys or aqua_mode and
701+
# the chemistry cannot produce the nitrogen depostion fluxes
702+
if (!($simple_phys or $aqua_mode)) {
703+
my $chem_nitrodep = chem_has_species($cfg, 'NO') and chem_has_species($cfg, 'NH3');
704+
if ((!$chem_nitrodep) or ($chem =~ /geoschem/)) {
705+
add_default($nl, 'stream_ndep_mesh_filename');
706+
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);
710+
}
711+
}
712+
708713
# Topography
709714
add_default($nl, 'use_topo_file');
710715
my $use_topo_file = $nl->get_value('use_topo_file');
@@ -1268,6 +1273,7 @@ if ($carma ne 'none') {
12681273
add_default($nl, 'carma_model', 'val'=>$carma);
12691274
add_default($nl, 'carma_flag', 'val'=>'.true.');
12701275
add_default($nl, 'history_carma', 'val'=>'.true.');
1276+
add_default($nl, 'carma_sulfnuc_method','val'=>'ZhaoTurco');
12711277
}
12721278
if ($carma eq 'bc_strat') {
12731279
add_default($nl, 'carma_do_drydep', 'val'=>'.true.');
@@ -1587,7 +1593,7 @@ if (defined $nl->get_value('prescribed_strataero_3modes')) {
15871593

15881594
# determine if prescribed stratospheric aerosol data is needed
15891595
if ( ($het_chem) || ($nl->get_value('prescribed_strataero_feedback') =~ /$TRUE/io ) ){
1590-
if ( ($carma ne 'sulfate') && !($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols
1596+
if ( !($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols
15911597

15921598
unless (defined $nl->get_value('prescribed_strataero_type')) {
15931599
add_default($nl, 'prescribed_strataero_type','val'=>'CYCLICAL');

‎bld/configure‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,6 +2323,7 @@ sub write_filepath
23232323
print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n";
23242324
print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n";
23252325
print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n";
2326+
print $fh "$camsrcdir/src/atmos_phys/schemes/check_energy\n";
23262327
print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n";
23272328

23282329
# Dynamics package and test utilities

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@
235235
<ncdata dyn="se" hgrid="ne120np4" nlev="30" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc</ncdata>
236236

237237
<ncdata dyn="se" hgrid="ne3np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc</ncdata>
238-
<ncdata dyn="se" hgrid="ne3np4" nlev="58" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.nc</ncdata>
239-
<ncdata dyn="se" hgrid="ne3np4" nlev="93" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc</ncdata>
240238
<ncdata dyn="se" hgrid="ne5np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc</ncdata>
241239
<ncdata dyn="se" hgrid="ne16np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc</ncdata>
242240
<ncdata dyn="se" hgrid="ne30np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc</ncdata>
@@ -656,13 +654,13 @@
656654
<flbc_file chem="ghg_mam4">atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
657655

658656
<!-- Time-variant CO2 fossil fuel emissions -->
659-
<co2flux_fuel_file hgrid="0.9x1.25" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
660-
<co2flux_fuel_file hgrid="1.9x2.5" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
661-
<co2flux_fuel_file hgrid="C384" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
662-
<co2flux_fuel_file hgrid="C192" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
663-
<co2flux_fuel_file hgrid="C96" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
664-
<co2flux_fuel_file hgrid="C48" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
665-
<co2flux_fuel_file hgrid="C24" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
657+
<co2flux_fuel_file hgrid="0.9x1.25" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
658+
<co2flux_fuel_file hgrid="1.9x2.5" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
659+
<co2flux_fuel_file hgrid="C384" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
660+
<co2flux_fuel_file hgrid="C192" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
661+
<co2flux_fuel_file hgrid="C96" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
662+
<co2flux_fuel_file hgrid="C48" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
663+
<co2flux_fuel_file hgrid="C24" sim_year="1850-2015">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
666664

667665
<ac_CO2_emis hgrid="0.9x1.25">ac_CO2_filelist_175001-201512_fv_0.9x1.25_c20181011.txt</ac_CO2_emis>
668666
<ac_CO2_emis hgrid="1.9x2.5" >ac_CO2_filelist_175001-201512_fv_1.9x2.5_c20181011.txt</ac_CO2_emis>
@@ -2000,6 +1998,25 @@
20001998
<soil_erod_file phys="cam4" >atm/cam/dst/dst_source2x2tuned-cam4-06132012.nc</soil_erod_file>
20011999
<soil_erod_file phys="cam4" hgrid="0.9x1.25">atm/cam/dst/dst_source1x1tuned-cam4-06202012.nc</soil_erod_file>
20022000

2001+
<!-- nitrogen deposition to surface models -->
2002+
<stream_ndep_mesh_filename>share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</stream_ndep_mesh_filename>
2003+
2004+
<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>
2005+
<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>
2006+
2007+
<stream_ndep_year_first >2000</stream_ndep_year_first>
2008+
<stream_ndep_year_first sim_year="1850">1850</stream_ndep_year_first>
2009+
<stream_ndep_year_first sim_year="1850-2015">1850</stream_ndep_year_first>
2010+
<stream_ndep_year_first sim_year="2010">2010</stream_ndep_year_first>
2011+
2012+
<stream_ndep_year_last >2000</stream_ndep_year_last>
2013+
<stream_ndep_year_last sim_year="1850">1850</stream_ndep_year_last>
2014+
<stream_ndep_year_last sim_year="1850-2015">2015</stream_ndep_year_last>
2015+
<stream_ndep_year_last sim_year="2010">2010</stream_ndep_year_last>
2016+
2017+
<stream_ndep_year_align >1</stream_ndep_year_align>
2018+
<stream_ndep_year_align sim_year="1850-2015">1850</stream_ndep_year_align>
2019+
20032020
<!-- Turbulent Mountain Stress -->
20042021
<do_tms > .false. </do_tms>
20052022
<do_tms waccm_phys="1" phys="cam4" > .true. </do_tms>

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4375,6 +4375,23 @@ is not active.
43754375
Default: none
43764376
</entry>
43774377

4378+
<entry id="carma_sulfnuc_method" type="char*10" category="carma"
4379+
group="carma_nl" valid_values="ZhaoTurco,Vehkamaki" >
4380+
Nucleation methods:
4381+
ZhaoTurco
4382+
Zhao, J. and Turco, R.,
4383+
Nucleation simulations in the wake of a jet aircraft in stratospheric flight,
4384+
J. Aerosol Sci., 26, 779-795, 1995,
4385+
https://doi.org/10.1016/0021-8502(95)00010-A
4386+
Vehkamaki
4387+
Vehkamaki, H., M. Kulmala, I. Napari, K.E.J. Lehtinen,
4388+
C. Timmreck, M. Noppel and A. Laaksonen, 2002,
4389+
An improved parameterization for sulfuric acid-water nucleation
4390+
rates for tropospheric and stratospheric conditions,
4391+
J. Geophys. Res., 107, 4622, doi:10.1029/2002jd002184
4392+
Default: none
4393+
</entry>
4394+
43784395
<entry id="carma_conmax" type="real" category="carma"
43794396
group="carma_nl" valid_values="" >
43804397
A fraction that scales how tight the convergence criteria are to
@@ -7508,40 +7525,29 @@ Bubble-mediated sea-air transfer. See ocean_emis.F90 for details.
75087525
Default: FALSE
75097526
</entry>
75107527

7511-
<entry id="ndep_list" type="char*16(2)" category="Nitrogen Deposition"
7512-
group="ndep_inparm" valid_values="" >
7513-
List of nitrogen deposition fluxes to be sent from CAM to surface models.
7514-
Default: set by build-namelist.
7515-
</entry>
7516-
75177528
<entry id="stream_ndep_year_first" type="integer" category="Nitrogen Deposition"
75187529
group="ndep_stream_nl" valid_values="" >
7519-
Year first to use in nitrogen deposition stream data. Set by case xml variable
7520-
CAM_STREAM_NDEP_YEAR_FIRST
7530+
Year first to use in nitrogen deposition stream data.
75217531
</entry>
75227532

75237533
<entry id="stream_ndep_year_last" type="integer" category="Nitrogen Deposition"
75247534
group="ndep_stream_nl" valid_values="" >
75257535
Year last to use in nitrogen deposition stream data.
7526-
Set by case xml variable CAM_STREAM_NDEP_YEAR_LAST
75277536
</entry>
75287537

75297538
<entry id="stream_ndep_year_align" type="integer" category="Nitrogen Deposition"
75307539
group="ndep_stream_nl" valid_values="" >
7531-
Model year to align with CAM_STREAM_NDEP_YEAR_FIRST.
7532-
Set by case xml variable CAM_STREAM_NDEP_YEAR_ALIGN
7540+
Model year to align with stream_ndep_year_first.
75337541
</entry>
75347542

75357543
<entry id="stream_ndep_data_filename" type="char*256" input_pathname="abs" category="Nitrogen Deposition"
75367544
group="ndep_stream_nl" valid_values="" >
7537-
NDEP stream data filename.
7538-
Set by case xml variable CAM_STREAM_NDEP_DATA_FILENAME.
7545+
Nitrogen deposition stream data filename.
75397546
</entry>
75407547

75417548
<entry id="stream_ndep_mesh_filename" type="char*256" input_pathname="abs" category="Nitrogen Deposition"
75427549
group="ndep_stream_nl" valid_values="" >
7543-
NDEP mesh file corresponding to sream_ndep_data_filename.
7544-
Set by case xml variable CAM_STREAM_NDEP_MESH_FILENAME.
7550+
Grid mesh file corresponding to stream_ndep_data_filename.
75457551
</entry>
75467552

75477553
<entry id="megan_factors_file" type="char*256" input_pathname="abs" category="VOC_emissions"
@@ -8673,7 +8679,7 @@ Default: "."
86738679
</entry>
86748680

86758681
<entry id="sim_year" type="char*9" category="cam"
8676-
group="camexp" valid_values="1850,2000,1850-2000">
8682+
group="camexp" valid_values="1850,2000,2010,1850-2000,1850-2015">
86778683
This varible is only used internally by build-namelist to determine
86788684
appropriate defaults for climatological or transient forcing datasets.
86798685
Default: set by build-namelist.

‎bld/namelist_files/use_cases/1850_cam_lt.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,7 @@
6161
<csw_time_type>CYCLICAL</csw_time_type>
6262
<csw_cycle_yr>1850 </csw_cycle_yr>
6363

64+
<!-- for prescribed nitrogen deposition fluxes -->
65+
<sim_year>1850</sim_year>
66+
6467
</namelist_defaults>

‎bld/namelist_files/use_cases/1850_cam_mt.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,7 @@
5656
<csw_time_type>CYCLICAL</csw_time_type>
5757
<csw_cycle_yr>1850 </csw_cycle_yr>
5858

59+
<!-- for prescribed nitrogen deposition fluxes -->
60+
<sim_year>1850</sim_year>
61+
5962
</namelist_defaults>

‎bld/namelist_files/use_cases/2000_geoschem.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<!-- The below line is not commented out in 2000_trop_strat_vbs_cam6.xml -->
3737
<!-- <prescribed_strataero_cycle_yr>2000</prescribed_strataero_cycle_yr> -->
3838

39-
<!-- The below line is not commented out in 2000_trop_strat_vbs_cam6.xml -->
40-
<!-- <ndep_list>'noy', 'nhx'</ndep_list> -->
41-
4239
<!-- History Files -->
4340

4441
<mfilt> 1,30,365,240,240,480,365,73,30 </mfilt>

‎bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@
131131
<!-- HEMCO emissions -->
132132
<hemco_emission_year>2000</hemco_emission_year>
133133

134-
<ndep_list>'noy', 'nhx'</ndep_list>
135-
136134
<!-- History Files -->
137135

138136
<mfilt> 1,30,365,240,240,480,365,73,30 </mfilt>

‎bld/namelist_files/use_cases/2010_cam6.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,7 @@
8383
<flbc_type> 'CYCLICAL' </flbc_type>
8484
<flbc_cycle_yr> 2010 </flbc_cycle_yr>
8585

86+
<!-- sim_year -->
87+
<sim_year>2010</sim_year>
88+
8689
</namelist_defaults>

0 commit comments

Comments
 (0)