Skip to content

Commit

Permalink
Merge branch 'cam_development' into hplin/hk_conv
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimmielin
jimmielin committed Mar 5, 2025
2 parents 95dd987 + 0097d12 commit 04b38e4
Show file tree
Hide file tree
Showing 108 changed files with 52,261 additions and 558 deletions.
190 changes: 135 additions & 55 deletions bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1545,6 +1545,68 @@ elsif ($carma eq 'tholin') {
add_default($nl, 'carma_emis_total', 'val'=>'1e5');
add_default($nl, 'carma_emis_file');
}
elsif ($carma =~ /trop_strat/) {
add_default($nl, 'carma_do_fixedinit','val'=>'.false.');
add_default($nl, 'carma_do_partialinit','val'=>'.false.');
add_default($nl, 'carma_do_drydep', 'val'=>'.true.');
add_default($nl, 'carma_do_optics', 'val'=>'.false.');
add_default($nl, 'carma_do_vtran', 'val'=>'.true.');
add_default($nl, 'carma_do_wetdep', 'val'=>'.false.');
add_default($nl, 'carma_soilerosion_file');
add_default($nl, 'carma_fields', 'val'=>'Sl_soilw');
add_default($nl, 'carma_do_vdiff', 'val'=>'.true.');
add_default($nl, 'carma_do_WeibullK', 'val'=>'.false.');
add_default($nl, 'carma_seasalt_emis','val'=>'Gong');
add_default($nl, 'carma_do_coag', 'val'=>'.true.');
add_default($nl, 'carma_do_grow', 'val'=>'.true.');
add_default($nl, 'carma_do_substep', 'val'=>'.true.');
add_default($nl, 'carma_do_thermo', 'val'=>'.false.');
add_default($nl, 'carma_seasalt_emis','val'=>'Gong');
add_default($nl, 'carma_maxretries', 'val'=>'20');
add_default($nl, 'carma_maxsubsteps', 'val'=>'2');
add_default($nl, 'carma_dt_threshold','val'=>'2.0');
add_default($nl, 'carma_hetchem_feedback','val'=>'.false.');
add_default($nl, 'bin_defs');
add_default($nl, 'rad_climate');
add_default($nl, 'carma_do_emission', 'val'=>'.true.');
add_default($nl, 'water_refindex_file');
add_default($nl, 'carma_do_cloudborne', 'val'=>'.true.');

# emissions
add_default($nl, 'carma_BCOCemissions','val'=>'Specified');
my $carma_BCOCemis = $nl->get_value('carma_BCOCemissions');
$carma_BCOCemis =~ s/['"]//g; # strip quotes "'
if ($carma_BCOCemis eq 'Specified') {
my %verhash; # = ('ver'=>'cam6');
if ( $sim_year == '2000' ) {
%verhash = ('ver'=>'2000cam6');
add_default($nl, 'emissions_type', 'val'=>'CYCLICAL');
add_default($nl, 'emissions_cycle_yr', 'val'=>'2000');
} else {
%verhash = ('ver'=>'cam6');
add_default($nl, 'emissions_type', 'val'=>'INTERP_MISSING_MONTHS');
}
my %species = ('bc_a4_an_srf_file' => 'BC',
'bc_a4_bb_srf_file' => 'BC',
'pom_a4_an_srf_file' => 'OC',
'pom_a4_bb_srf_file' => 'OC' );
my $first = 1; my $pre = ""; my $val = "";
foreach my $id (sort keys %species) {
my $rel_filepath = get_default_value($id, \%verhash);
my $abs_filepath = set_abs_filepath($rel_filepath, $inputdata_rootdir);
$val .= $pre . quote_string("$species{$id} -> " . $abs_filepath);
if ($first) { $pre = ","; $first = 0; }
}
add_default($nl, 'emissions_specifier', 'val'=>$val);
} else {
add_default($nl, 'BC_GAINS_filename');
add_default($nl, 'OC_GAINS_filename');
add_default($nl, 'BC_ship_filename');
add_default($nl, 'OC_ship_filename');
add_default($nl, 'BC_GFEDv3_filename');
add_default($nl, 'OC_GFEDv3_filename');
}
}

# Stratospheric sulfur aerosols

Expand Down Expand Up @@ -1591,7 +1653,8 @@ if (defined $nl->get_value('prescribed_strataero_3modes')) {

# determine if prescribed stratospheric aerosol data is needed
if ( ($het_chem) || ($nl->get_value('prescribed_strataero_feedback') =~ /$TRUE/io ) ){
if ( !($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols
if ( !($carma =~ /trop_strat/) &&
!($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols

unless (defined $nl->get_value('prescribed_strataero_type')) {
add_default($nl, 'prescribed_strataero_type','val'=>'CYCLICAL');
Expand Down Expand Up @@ -2222,10 +2285,10 @@ if ($chem eq 'trop_mam3') {
}

# CMIP6 emissions
if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam7/)) {
if ($phys =~ /cam6/ or $phys =~ /cam7/) {

# OASISS (ocean) DMS emissions
if (!$aqua_mode and !$scam) {
if (!$aqua_mode and !$scam and chem_has_species($cfg, 'DMS')) {
my $rel_filepath = get_default_value('dms_ocn_emis_file');
my $abs_filepath = set_abs_filepath($rel_filepath, $inputdata_rootdir);
my $val = quote_string("DMS -> ". $abs_filepath);
Expand All @@ -2243,37 +2306,40 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
}
}

my %species;
my %species = ('dms_bb_srf_file' => 'DMS',
'so2_ag_sh_file' => 'SO2',
'so2_an_srf_file' => 'SO2',
'so2_bb_srf_file' => 'SO2');

# Surface emission datasets:
%species = ('dms_bb_srf_file' => 'DMS',
'so2_ag_sh_file' => 'SO2',
'so2_an_srf_file' => 'SO2',
'so2_bb_srf_file' => 'SO2',
'so4_a1_an_srf_file' => 'so4_a1',
'so4_a1_bb_srf_file' => 'so4_a1',
'so4_a2_an_srf_file' => 'so4_a2',
'num_a1_sh_srf_file' => 'num_a1',
'num_a1_bb_srf_file' => 'num_a1',
'num_a2_an_srf_file' => 'num_a2',
'bc_a4_an_srf_file' => 'bc_a4',
'bc_a4_bb_srf_file' => 'bc_a4',
'num_a4_bc_srf_file' => 'num_a4',
'num_a4_oc_srf_file' => 'num_a4',
'num_a4_bb_srf_file' => 'num_a4',
'num_pom_bb_srf_file' => 'num_a4' );
if ((not defined $nl->get_value('csw_specifier')) or (not $nl->get_value('csw_specifier') ~~ /DMS/)) {
%species = (%species,
'dms_ot_srf_file' => 'DMS' );
}
if ($chem =~ /_vbsext/) {
%species = (%species,
'pom_a4_an_srf_file' => 'pomff1_a4',
'pom_a4_bb_srf_file' => 'pombb1_a4' );
} else {
if ($chem =~ /_mam4/ or $chem =~ /_mam5/) {

# Surface emission datasets:
%species = (%species,
'pom_a4_an_srf_file' => 'pom_a4',
'pom_a4_bb_srf_file' => 'pom_a4' );
'so4_a1_an_srf_file' => 'so4_a1',
'so4_a1_bb_srf_file' => 'so4_a1',
'so4_a2_an_srf_file' => 'so4_a2',
'num_a1_sh_srf_file' => 'num_a1',
'num_a1_bb_srf_file' => 'num_a1',
'num_a2_an_srf_file' => 'num_a2',
'bc_a4_an_srf_file' => 'bc_a4',
'bc_a4_bb_srf_file' => 'bc_a4',
'num_a4_bc_srf_file' => 'num_a4',
'num_a4_oc_srf_file' => 'num_a4',
'num_a4_bb_srf_file' => 'num_a4',
'num_pom_bb_srf_file' => 'num_a4' );
if ((not defined $nl->get_value('csw_specifier')) or (not $nl->get_value('csw_specifier') ~~ /DMS/)) {
%species = (%species,
'dms_ot_srf_file' => 'DMS' );
}
if ($chem =~ /_vbsext/) {
%species = (%species,
'pom_a4_an_srf_file' => 'pomff1_a4',
'pom_a4_bb_srf_file' => 'pombb1_a4' );
} else {
%species = (%species,
'pom_a4_an_srf_file' => 'pom_a4',
'pom_a4_bb_srf_file' => 'pom_a4' );
}
}

# for old simple SOA schemes (without SOAE)
Expand Down Expand Up @@ -2430,7 +2496,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
}
}
}
if ($chem !~ /geoschem/) {
if (($chem !~ /geoschem/) and ($chem ne 'none')) {
add_default($nl, 'srf_emis_specifier', 'val'=>$val);
unless (defined $nl->get_value('srf_emis_type')) {
add_default($nl, 'srf_emis_type', 'val'=>'CYCLICAL');
Expand All @@ -2439,20 +2505,25 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
}

# Vertical emission datasets:
%species = ('so2_cv_ext_file' => 'SO2',
'so4_a1_an_ext_file' => 'so4_a1',
'so4_a1_cv_ext_file' => 'so4_a1',
'so4_a2_cv_ext_file' => 'so4_a2',
'num_a1_an_ext_file' => 'num_a1',
'num_a1_cv_ext_file' => 'num_a1',
'num_a2_cv_ext_file' => 'num_a2',
%species = ('so2_cv_ext_file' => 'SO2');
if ($chem =~ /_mam4/ or $chem =~ /_mam5/) {
%species = (%species,
'so4_a1_an_ext_file' => 'so4_a1',
'so4_a1_cv_ext_file' => 'so4_a1',
'so4_a2_cv_ext_file' => 'so4_a2',
'num_a1_an_ext_file' => 'num_a1',
'num_a1_cv_ext_file' => 'num_a1',
'num_a2_cv_ext_file' => 'num_a2',
);

}
# air craft emissions
if ($chem !~ /trop_mam/ and $chem !~ /ghg_mam/ and $chem !~ /waccm_sc/) {
%species = (%species,
if ($chem !~ /_noaer/) {
%species = (%species,
'bc_a4_ar_ext_file' => 'bc_a4',
'num_a4_ar_ext_file' => 'num_a4',
'num_a4_ar_ext_file' => 'num_a4' );
}
%species = (%species,
'no2_ar_ext_file' => 'NO2',
'so2_ar_ext_file' => 'SO2' );
} elsif ($chem =~ /ghg_mam/) {
Expand All @@ -2463,8 +2534,8 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
}

# for transient cases include volcanic emissions
if ( ($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) and
(defined $nl->get_value('ext_frc_type')) ) {
if ( (($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) or ($carma eq 'trop_strat'))
and (defined $nl->get_value('ext_frc_type')) ) {
if ( $nl->get_value('ext_frc_type') !~ /CYCLICAL/ ) {
my $hgrid = $cfg->get('hgrid');
if ($hgrid =~ /1.9x2.5/) {
Expand Down Expand Up @@ -2501,7 +2572,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
$first = 0;
}
}
if ($chem !~ /geoschem/) {
if (($chem !~ /geoschem/) and ($chem ne 'none')) {
add_default($nl, 'ext_frc_specifier', 'val'=>$val);
unless (defined $nl->get_value('ext_frc_type')) {
add_default($nl, 'ext_frc_type', 'val'=>"'CYCLICAL'");
Expand All @@ -2526,7 +2597,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
add_default($nl, 'megan_factors_file');
add_default($nl, 'megan_mapped_emisfctrs', 'val'=>'.false.');
}
if ($chem =~ /trop_strat_mam4_vbsext/ or $chem =~ /waccm_tsmlt/) {
if ($chem =~ /trop_strat_mam4_vbsext/ or $chem =~ /trop_strat_noaero/ or $chem =~ /waccm_tsmlt/) {
my $val = "'ISOP = isoprene',"
. "'MTERP = pinene_a + carene_3 + thujene_a + 2met_styrene + cymene_p + cymene_o + terpinolene + bornene +'"
. "' fenchene_a + ocimene_al + pinene_b + sabinene + camphene + limonene + phellandrene_a + terpinene_g +'"
Expand Down Expand Up @@ -3310,7 +3381,7 @@ add_default($nl, 'microp_aero_wsubi_min');

# Ice nucleation options
if (!$simple_phys) {
if ($chem =~ /_mam/) {
if ($chem =~ /_mam/ or $carma =~ /trop_strat/) {
add_default($nl, 'use_hetfrz_classnuc');
} else {
add_default($nl, 'use_hetfrz_classnuc', 'val'=>'.false.');
Expand Down Expand Up @@ -3577,6 +3648,10 @@ if ($chem =~ /_mam/) {
add_default($nl, 'sol_factb_interstitial');
add_default($nl, 'sol_factic_interstitial');
}
if ($carma =~ /trop_strat/) {
add_default($nl, 'sol_facti_cloud_borne');
add_default($nl, 'sol_factic_interstitial');
}

# Turbulent Mountain Stress
my $do_tms;
Expand Down Expand Up @@ -4927,7 +5002,7 @@ sub check_input_files {
my @vars = qw(aircraft_specifier csw_specifier ext_frc_specifier
rad_climate rad_diag_1 rad_diag_2 rad_diag_3 rad_diag_4
rad_diag_5 rad_diag_6 rad_diag_7 rad_diag_8 rad_diag_9
rad_diag_10 srf_emis_specifier mode_defs);
rad_diag_10 srf_emis_specifier mode_defs bin_defs);

foreach my $var (@vars) {

Expand Down Expand Up @@ -4987,11 +5062,11 @@ sub check_input_files {
}
}
}
# Look for values that begin with 'X:name:name2' where X is one of [AMN]
# Look for values that begin with 'X:name:name2' where X is one of [ABMN]
# Extract name and filename
elsif ($spec =~ m/^\s*[AMN]:(\w+) # name of species preceded by optional whitespace and X:
: # : separator
(\S+) # name2
elsif ($spec =~ m/^\s*[ABMN]:(\w+) # name of species preceded by optional whitespace and X:
: # : separator
(\S+) # name2
/xo) {
my $name = $1;
my $name2 = $2;
Expand Down Expand Up @@ -5022,9 +5097,14 @@ sub check_input_files {
my @flds = split /:/, $name2;
if (scalar(@flds) >= 4) {

my $file;
if ($flds[3] =~ m:^[/\$]:) {

my $file = $flds[3];
$file = $flds[3];
}
elsif ($flds[4] =~ m:^[/\$]:) {
$file = $flds[4];
}
if (defined $file) {
if ($inputdata_rootdir) {
print $fh "$var for $name = $file\n";
}
Expand Down
12 changes: 7 additions & 5 deletions bld/config_files/definition.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,18 @@ PBL package: uw (University of Washington), hb (Holtslag and Boville), hbr
Radiative transfer calculation:
camrt (CAM4 RT package), rrtmg (RRTMG package from AER), rrtmgp (updated version).
</entry>
<entry id="carma" valid_values="none,bc_strat,cirrus,cirrus_dust,dust,meteor_impact,meteor_smoke,mixed_sulfate,pmc,pmc_sulfate,sea_salt,sulfate,tholin,test_detrain,test_growth,test_passive,test_radiative,test_swelling,test_tracers,test_tracers2" value="none">
<entry id="carma" valid_values="none,bc_strat,cirrus,cirrus_dust,dust,meteor_impact,meteor_smoke,mixed_sulfate,pmc,pmc_sulfate,sea_salt,sulfate,tholin,test_detrain,test_growth,test_passive,test_radiative,test_swelling,test_tracers,test_tracers2,trop_strat_soa1,trop_strat_soa5" value="none">
CARMA sectional microphysics:
none (disabled), bc_strat (Stratospheric Black Carbon), cirrus (Cirrus Clouds),
cirrus_dust (Cirrus Clouds with dust), dust (Dust), meteor_impact (Meteor Impact),
meteor_smoke (Meteor Smoke), mixed_sulfate (Meteor Smoke and Sulfate), pmc (Polar Mesospheric Clouds), pmc_sulfate (PMC and Sulfate), sea_salt (Sea Salt),
sulfate (Sulfate Aerosols), tholin (early earth haze), test_detrain (Detrainment), test_growth (Particle Growth), test_passive (Passive Dust),
test_radiative (Radiatively Active Dust), test_swelling (Sea Salt), test_tracers (Asian Monsoon), test_tracers2 (Guam).
test_radiative (Radiatively Active Dust), test_swelling (Sea Salt), test_tracers (Asian Monsoon), test_tracers2 (Guam),
trop_strat_soa1 (Trop Strat Aerosols SOA1),
trop_strat_soa5 (Trop Strat Aerosols SOA5)
</entry>
<entry id="chem" valid_values="none,ghg_mam4,terminator,trop_mam3,trop_mam4,trop_mam7,trop_mozart,trop_strat_mam4_ts2,trop_strat_mam4_vbs,trop_strat_mam4_vbsext,trop_strat_mam5_ts2,trop_strat_mam5_ts4,trop_strat_mam5_vbs,trop_strat_mam5_vbsext,waccm_ma,waccm_mad,waccm_ma_sulfur,waccm_sc,waccm_sc_mam4,waccm_mad_mam4,waccm_ma_mam4,waccm_tsmlt_mam4,waccm_tsmlt_mam4_vbsext,waccm_mad_mam5,waccm_ma_mam5,waccm_tsmlt_mam5,waccm_tsmlt_mam5_vbsext,geoschem_mam4" value="">
Chemistry package: none,ghg_mam4,terminator,trop_mam3,trop_mam4,trop_mam7,trop_mozart,trop_strat_mam4_ts2,trop_strat_mam4_vbs,trop_strat_mam4_vbsext,trop_strat_mam5_ts2,trop_strat_mam5_ts4,trop_strat_mam5_vbs,trop_strat_mam5_vbsext,waccm_ma,waccm_mad,waccm_ma_sulfur,waccm_sc,waccm_sc_mam4,waccm_mad_mam4,waccm_ma_mam4,waccm_tsmlt_mam4,waccm_tsmlt_mam4_vbsext,waccm_mad_mam5,waccm_ma_mam5,waccm_tsmlt_mam5,waccm_tsmlt_mam5_vbsext,geoschem_mam4
<entry id="chem" valid_values="none,ghg_mam4,terminator,trop_mam3,trop_mam4,trop_mam7,trop_mozart,trop_strat_mam4_ts2,trop_strat_mam4_vbs,trop_strat_mam4_vbsext,trop_strat_mam5_ts2,trop_strat_mam5_ts4,trop_strat_mam5_vbs,trop_strat_mam5_vbsext,trop_strat_noaero,waccm_ma,waccm_mad,waccm_ma_sulfur,waccm_sc,waccm_sc_mam4,waccm_mad_mam4,waccm_ma_mam4,waccm_tsmlt_mam4,waccm_tsmlt_mam4_vbsext,waccm_mad_mam5,waccm_ma_mam5,waccm_tsmlt_mam5,waccm_tsmlt_mam5_vbsext,waccm_ma_noaero,geoschem_mam4" value="">
Chemistry package: none,ghg_mam4,terminator,trop_mam3,trop_mam4,trop_mam7,trop_mozart,trop_strat_mam4_ts2,trop_strat_mam4_vbs,trop_strat_mam4_vbsext,trop_strat_mam5_ts2,trop_strat_mam5_ts4,trop_strat_mam5_vbs,trop_strat_mam5_vbsext,trop_strat_noaero,waccm_ma,waccm_mad,waccm_ma_sulfur,waccm_sc,waccm_sc_mam4,waccm_mad_mam4,waccm_ma_mam4,waccm_tsmlt_mam4,waccm_tsmlt_mam4_vbsext,waccm_mad_mam5,waccm_ma_mam5,waccm_tsmlt_mam5,waccm_tsmlt_mam5_vbsext,waccm_ma_noaero,geoschem_mam4
</entry>
<entry id="prog_species" valid_values="DST,SSLT,SO4,GHG,OC,BC,CARBON16" value="" list="1">
Prognostic mozart species packages: list of any subset of the following: DST,SSLT,SO4,GHG,OC,BC,CARBON16
Expand Down Expand Up @@ -187,7 +189,7 @@ Total number of advected test tracers.
<entry id="age_of_air_trcs" valid_values="0,1" value="0">
Switch on (off) age of air tracers: 0=off, 1=on.
</entry>
<entry id="max_n_rad_cnst" value="30">
<entry id="max_n_rad_cnst" value="80">
Maximum number of constituents that are radiatively active or in any one
diagnostic list.
</entry>
Expand Down
Loading

0 comments on commit 04b38e4

Please sign in to comment.