Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/cam_development' into CESM-GC_re…
Browse files Browse the repository at this point in the history 
…based_on_cam6_0_034
  • Loading branch information
@lizziel
lizziel committed Dec 21, 2023
2 parents dcc7e20 + 536045c commit e06ddff
Show file tree
Hide file tree
Showing 98 changed files with 4,964 additions and 2,021 deletions.
12 changes: 6 additions & 6 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.78
tag = ccs_config_cesm0.0.82
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
local_path = ccs_config
Expand All @@ -21,22 +21,22 @@ externals = Externals.cfg
required = True

[cmeps]
tag = cmeps0.14.39
tag = cmeps0.14.43
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
required = True

[cdeps]
tag = cdeps1.0.21
tag = cdeps1.0.24
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
local_path = components/cdeps
externals = Externals_CDEPS.cfg
required = True

[cpl7]
tag = cpl77.0.6
tag = cpl77.0.7
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
local_path = components/cpl7
Expand Down Expand Up @@ -64,7 +64,7 @@ local_path = libraries/parallelio
required = True

[cime]
tag = cime6.0.156
tag = cime6.0.175
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
Expand All @@ -79,7 +79,7 @@ externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm5.1.dev139
tag = ctsm5.1.dev142
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
local_path = components/clm
Expand Down
27 changes: 11 additions & 16 deletions Externals_CAM.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,18 @@ required = True

[cosp2]
local_path = src/physics/cosp2/src
protocol = svn
repo_url = https://github.com/CFMIP/COSPv2.0/tags/
tag = v2.1.4cesm/src
protocol = git
repo_url = https://github.com/CFMIP/COSPv2.0
sparse = ../.cosp_sparse_checkout
tag = v2.1.4cesm
required = True

[clubb]
local_path = src/physics/clubb
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/CLUBB_core
required = True

[silhs]
local_path = src/physics/silhs
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/SILHS
protocol = git
repo_url = https://github.com/larson-group/clubb_release
sparse = ../.clubb_sparse_checkout
tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
required = True

[pumas]
Expand All @@ -55,9 +50,9 @@ tag = ALI_ARMS_v1.0.1
required = True

[atmos_phys]
tag = atmos_phys0_00_011
tag = atmos_phys0_01_000
protocol = git
repo_url = https://github.com/NCAR/atmospheric_physics
repo_url = https://github.com/ESCOMP/atmospheric_physics
required = True
local_path = src/atmos_phys

Expand All @@ -73,7 +68,7 @@ local_path = src/dynamics/mpas/dycore
protocol = git
repo_url = https://github.com/MPAS-Dev/MPAS-Model.git
sparse = ../.mpas_sparse_checkout
hash = ff76a231
hash = b8c33daa
required = True

[geoschem]
Expand Down
12 changes: 11 additions & 1 deletion bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,11 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
'num_a4_ar_ext_file' => 'num_a4',
'no2_ar_ext_file' => 'NO2',
'so2_ar_ext_file' => 'SO2' );
} elsif ($chem =~ /ghg_mam/) {
%species = (%species,
'bc_a4_ar_ext_file' => 'bc_a4',
'num_a4_ar_ext_file' => 'num_a4',
'so2_ar_ext_file' => 'SO2' );
}

# for transient cases include volcanic emissions
Expand Down Expand Up @@ -3205,7 +3210,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
$micro_mg_dcs = '500.D-6'; # default for cam6
}
elsif ($phys eq 'cam_dev') {
$micro_mg_dcs = '250.D-6'; # default for cam_dev
$micro_mg_dcs = '500.D-6'; # default for cam_dev
}
}

Expand All @@ -3219,6 +3224,7 @@ add_default($nl, 'microp_aero_npccn_scale');
add_default($nl, 'microp_aero_wsub_scale');
add_default($nl, 'microp_aero_wsubi_scale');
add_default($nl, 'microp_aero_wsub_min');
add_default($nl, 'microp_aero_wsub_min_asf');
add_default($nl, 'microp_aero_wsubi_min');

# Ice nucleation options
Expand Down Expand Up @@ -3550,7 +3556,10 @@ if (!$simple_phys) {
add_default($nl, 'cldfrc2m_rhmaxi');
add_default($nl, 'cldfrc2m_rhminis');
add_default($nl, 'cldfrc2m_rhmaxis');
add_default($nl, 'cldfrc2m_qist_min');
add_default($nl, 'cldfrc2m_qist_max');
add_default($nl, 'cldfrc2m_do_subgrid_growth');
add_default($nl, 'cldfrc2m_do_avg_aist_algs');
}

my $rk_strat_polstrat_rhmin = $nl->get_value('rk_strat_polstrat_rhmin');
Expand Down Expand Up @@ -4142,6 +4151,7 @@ if ($dyn =~ /mpas/) {
add_default($nl, 'mpas_zd');
add_default($nl, 'mpas_xnutr');
add_default($nl, 'mpas_cam_coef');
add_default($nl, 'mpas_cam_damping_levels');
add_default($nl, 'mpas_print_detailed_minmax_vel');
add_default($nl, 'mpas_rayleigh_damp_u');
add_default($nl, 'mpas_rayleigh_damp_u_timescale_days');
Expand Down
19 changes: 10 additions & 9 deletions bld/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2224,11 +2224,11 @@ sub write_filepath
}

if ($clubb_sgs) {
print $fh "$camsrcdir/src/physics/clubb\n";
print $fh "$camsrcdir/src/physics/clubb/src/CLUBB_core\n";
}

if ($silhs) {
print $fh "$camsrcdir/src/physics/silhs\n";
print $fh "$camsrcdir/src/physics/clubb/src/SILHS\n";
}

if ($phys_pkg eq 'cam_dev') {
Expand Down Expand Up @@ -2289,6 +2289,7 @@ sub write_filepath
print $fh "$camsrcdir/src/cpl/$cpl\n";
print $fh "$camsrcdir/src/control\n";
print $fh "$camsrcdir/src/utils\n";
print $fh "$camsrcdir/src/utils/cam_ccpp\n";
print $fh "$camsrcdir/src/atmos_phys/utilities\n";


Expand Down Expand Up @@ -2324,13 +2325,13 @@ sub write_cosp_makefile
CAM_BLD := $cam_bld
COSP_PATH := $cam_dir/src/physics/cosp2
ISCCP_PATH := $cam_dir/src/physics/cosp2/src/simulator/icarus
RS_PATH := $cam_dir/src/physics/cosp2/src/simulator/quickbeam
RT_PATH := $cam_dir/src/physics/cosp2/src/simulator/rttov
CS_PATH := $cam_dir/src/physics/cosp2/src/simulator/actsim
MISR_PATH := $cam_dir/src/physics/cosp2/src/simulator/MISR_simulator
MODIS_PATH := $cam_dir/src/physics/cosp2/src/simulator/MODIS_simulator
PARASOL_PATH := $cam_dir/src/physics/cosp2/src/simulator/parasol
ISCCP_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/icarus
RS_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/quickbeam
RT_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/rttov
CS_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/actsim
MISR_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/MISR_simulator
MODIS_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/MODIS_simulator
PARASOL_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/parasol
EOF

Expand Down
36 changes: 31 additions & 5 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<ncdata dyn="se" hgrid="ne16np4" nlev="126" waccmx="1" aquaplanet="1">atm/waccm/ic/waccmx_aqua_ne16np4_126L_c191108.nc</ncdata>
<ncdata dyn="se" hgrid="ne16np4" nlev="126" waccmx="1" aquaplanet="1" ionosphere="none">atm/waccm/ic/waccmx4_neutral_aquap_ne16np4_126lev_c200827.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="130" waccmx="1" >atm/waccm/ic/fx2000_phys-ionos-cpl_ne30_spinup01.cam.i.0002-01-01-00000_c201014.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" npg="3" nlev="130" waccmx="1" >atm/waccm/ic/waccmx_ne30pg3_c231005.nc</ncdata>

<ncdata dyn="fv3" hgrid="C24" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/fv3/aqua_0006-01-01_C24_L32_c200625.nc</ncdata>
<ncdata dyn="fv3" hgrid="C48" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/fv3/aqua_0006-01-01_C48_L32_c200625.nc</ncdata>
Expand Down Expand Up @@ -273,6 +274,8 @@

<ncdata dyn="se" hgrid="ne0np4CONUS.ne30x8" nlev="70" ic_ymd="101">atm/waccm/ic/FW2000_CONUS_30x8_L70_01-01-0001_c200602.nc</ncdata>

<ncdata hgrid="mpasa120" nlev="70" waccm_phys="1">atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc</ncdata>

<ncdata hgrid="mpasa120" nlev="32" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc</ncdata>
<ncdata hgrid="mpasa480" nlev="32" >atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c211013.nc</ncdata>

Expand Down Expand Up @@ -1315,6 +1318,11 @@
<so4_a1_an_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc</so4_a1_an_ext_file>
<num_a1_an_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc</num_a1_an_ext_file>

<bc_a4_ar_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_bc_a4_aircraft_vertical_1750-2015_ne30pg3_c20231112.nc</bc_a4_ar_ext_file>
<num_a4_ar_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_bc_a4_aircraft_vertical_1750-2015_ne30pg3_c20231112.nc</num_a4_ar_ext_file>
<no2_ar_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_NO2_aircraft_vertical_1750-2015_ne30pg3_c20231112.nc</no2_ar_ext_file>
<so2_ar_ext_file hgrid="ne30np4" npg="3" ver="cam6">atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_aircraft_vertical_1750-2015_ne30pg3_c20231112.nc</so2_ar_ext_file>

<!-- ne30 pg2 -->

<dms_ot_srf_file hgrid="ne30np4" npg="2" ver="cam6">atm/cam/chem/emis/historical_ne30pg2/emissions-cmip6_DMS_other_surface_1750_2015_ne30pg2_c20200630.nc</dms_ot_srf_file>
Expand Down Expand Up @@ -2072,9 +2080,10 @@
<clubb_do_energyfix > .true. </clubb_do_energyfix>
<clubb_do_liqsupersat > .false. </clubb_do_liqsupersat>
<clubb_gamma_coef > 0.308 </clubb_gamma_coef>
<clubb_gamma_coef phys="cam_dev" > 0.3 </clubb_gamma_coef>
<clubb_gamma_coef hgrid="1.9x2.5" phys="cam6" > 0.280 </clubb_gamma_coef>
<clubb_gamma_coef dyn="se" > 0.270 </clubb_gamma_coef>
<clubb_gamma_coefb > 0.32 </clubb_gamma_coefb>
<clubb_gamma_coefb phys="cam_dev" > 0.3 </clubb_gamma_coefb>
<clubb_ipdf_call_placement > 2 </clubb_ipdf_call_placement>
<clubb_lambda0_stability_coef > 0.04 </clubb_lambda0_stability_coef>
<clubb_lmin_coef > 0.1 </clubb_lmin_coef>
Expand Down Expand Up @@ -2232,20 +2241,23 @@
<microp_aero_npccn_scale > 1.D0 </microp_aero_npccn_scale>
<microp_aero_npccn_scale microphys="mg2" > 1.D0 </microp_aero_npccn_scale>

<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
<microp_aero_wsub_scale > 1.D0 </microp_aero_wsub_scale>
<microp_aero_wsub_scale phys="cam_dev" > 0.375D0 </microp_aero_wsub_scale>

<microp_aero_wsubi_scale > 1.D0 </microp_aero_wsubi_scale>
<microp_aero_wsubi_scale phys="cam_dev" > 2.5D0 </microp_aero_wsubi_scale>

<microp_aero_wsub_min > 0.2D0 </microp_aero_wsub_min>
<microp_aero_wsub_min phys="cam_dev" > 0.1D0 </microp_aero_wsub_min>

<microp_aero_wsub_min_asf > 0.1D0 </microp_aero_wsub_min_asf>
<microp_aero_wsub_min_asf phys="cam_dev" > 0.0D0 </microp_aero_wsub_min_asf>

<microp_aero_wsubi_min > 0.001D0 </microp_aero_wsubi_min>

<micro_mg_homog_size > 25.D-6 </micro_mg_homog_size>
<micro_mg_homog_size microphys="mg2" > 25.D-6 </micro_mg_homog_size>

<micro_mg_vtrmi_factor > 1.D0 </micro_mg_vtrmi_factor>
<micro_mg_vtrmi_factor phys="cam_dev" > 0.5D0 </micro_mg_vtrmi_factor>

<micro_mg_effi_factor > 1.D0 </micro_mg_effi_factor>
<micro_mg_effi_factor microphys="mg2" > 1.D0 </micro_mg_effi_factor>
Expand Down Expand Up @@ -2651,12 +2663,19 @@
<cldfrc2m_rhmaxis clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxis>
<cldfrc2m_rhmaxis spcam_clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxis>

<cldfrc2m_qist_min >1.e-7 </cldfrc2m_qist_min>
<cldfrc2m_qist_min phys="cam_dev">5.e-6 </cldfrc2m_qist_min>
<cldfrc2m_qist_max >5.e-3 </cldfrc2m_qist_max>

<micro_mg_adjust_cpt>.false.</micro_mg_adjust_cpt>

<cldfrc2m_do_subgrid_growth >.false.</cldfrc2m_do_subgrid_growth>
<cldfrc2m_do_subgrid_growth phys="cam6" >.true.</cldfrc2m_do_subgrid_growth>
<cldfrc2m_do_subgrid_growth phys="cam_dev">.true.</cldfrc2m_do_subgrid_growth>

<cldfrc2m_do_avg_aist_algs >.false.</cldfrc2m_do_avg_aist_algs>
<cldfrc2m_do_avg_aist_algs phys="cam_dev" >.true.</cldfrc2m_do_avg_aist_algs>

<!-- Cldwat -->
<rk_strat_icritc > 5.0e-6 </rk_strat_icritc>
<rk_strat_icritc dyn="fv" unicon="1" > 9.5e-6 </rk_strat_icritc>
Expand Down Expand Up @@ -3023,7 +3042,7 @@
<!-- ================================================================== -->

<se_pgf_formulation> 1</se_pgf_formulation>
<se_pgf_formulation waccmx="1">2</se_pgf_formulation>
<se_pgf_formulation waccmx="1">3</se_pgf_formulation>
<se_ftype> 2 </se_ftype>

<se_large_Courant_incr > .true. </se_large_Courant_incr>
Expand Down Expand Up @@ -3130,12 +3149,14 @@
<mpas_time_integration_order > 2 </mpas_time_integration_order>
<mpas_dt > 1800.0D0 </mpas_dt>
<mpas_dt hgrid="mpasa120" > 900.0D0 </mpas_dt>
<mpas_dt hgrid="mpasa120" waccm_phys="1"> 600.D0 </mpas_dt>
<mpas_dt hgrid="mpasa60" > 450.0D0 </mpas_dt>
<mpas_dt hgrid="mpasa30" > 225.0D0 </mpas_dt>

<mpas_split_dynamics_transport>.true.</mpas_split_dynamics_transport>
<mpas_number_of_sub_steps > 2 </mpas_number_of_sub_steps>
<mpas_dynamics_split_steps > 3 </mpas_dynamics_split_steps>
<mpas_dynamics_split_steps hgrid="mpasa120" waccm_phys="1"> 4 </mpas_dynamics_split_steps>
<mpas_h_mom_eddy_visc2 > 0.0D0 </mpas_h_mom_eddy_visc2>
<mpas_h_mom_eddy_visc4 > 0.0D0 </mpas_h_mom_eddy_visc4>
<mpas_v_mom_eddy_visc2 > 0.0D0 </mpas_v_mom_eddy_visc2>
Expand Down Expand Up @@ -3165,12 +3186,17 @@
<mpas_smagorinsky_coef > 0.125D0 </mpas_smagorinsky_coef>
<mpas_mix_full > .true. </mpas_mix_full>
<mpas_epssm > 0.1D0 </mpas_epssm>
<mpas_epssm hgrid="mpasa120" waccm_phys="1"> 0.5D0 </mpas_epssm>
<mpas_smdiv > 0.1D0 </mpas_smdiv>
<mpas_apvm_upwinding > 0.5D0 </mpas_apvm_upwinding>
<mpas_apvm_upwinding hgrid="mpasa120" waccm_phys="1"> 0.0D0 </mpas_apvm_upwinding>
<mpas_h_ScaleWithMesh > .true. </mpas_h_ScaleWithMesh>
<mpas_zd > 22000.0D0 </mpas_zd>
<mpas_zd hgrid="mpasa120" waccm_phys="1"> 80000.0D0 </mpas_zd>
<mpas_xnutr > 0.2D0 </mpas_xnutr>
<mpas_cam_coef > 0.0D0 </mpas_cam_coef>
<mpas_cam_coef hgrid="mpasa120" waccm_phys="1"> 0.2D0 </mpas_cam_coef>
<mpas_cam_damping_levels > 0 </mpas_cam_damping_levels>
<mpas_rayleigh_damp_u > .true. </mpas_rayleigh_damp_u>
<mpas_rayleigh_damp_u_timescale_days> 5.0 </mpas_rayleigh_damp_u_timescale_days>
<mpas_number_rayleigh_damp_u_levels> 5 </mpas_number_rayleigh_damp_u_levels>
Expand Down
Loading

0 comments on commit e06ddff

Please sign in to comment.