Skip to content

Commit

Permalink
Remove microphysics from zm and make lower layer portable
Browse files Browse the repository at this point in the history
  • Loading branch information
@cacraigucar
cacraigucar committed Sep 25, 2023
1 parent 00ff0cb commit 682234a
Show file tree
Hide file tree
Showing 11 changed files with 757 additions and 8,668 deletions.
8 changes: 4 additions & 4 deletions Externals_CAM.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ required = True
local_path = src/physics/carma/base
protocol = git
repo_url = https://github.com/ESCOMP/CARMA_base.git
tag = carma4_01
tag = carma4_00
required = True

[cosp2]
Expand Down Expand Up @@ -51,13 +51,13 @@ required = True
local_path = src/physics/ali_arms
protocol = git
repo_url = https://github.com/ESCOMP/ALI-ARMS
tag = ALI_ARMS_v1.0.1
tag = ALI_ARMS_v1.0.0
required = True

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

Expand Down
5 changes: 0 additions & 5 deletions bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3380,9 +3380,6 @@ if ($clubb_sgs =~ /$TRUE/io) {
add_default($nl, 'clubb_mf_L0');
add_default($nl, 'clubb_mf_ent0');
add_default($nl, 'clubb_mf_nup');

#Turn on HB scheme where CLUBB not active
add_default($nl, 'do_hb_above_clubb');
}

# Force exit if running cam_dev and CLUBB is off
Expand Down Expand Up @@ -3477,7 +3474,6 @@ if (!$simple_phys) {
add_default($nl, 'zmconv_ke');
add_default($nl, 'zmconv_ke_lnd');
add_default($nl, 'zmconv_org');
add_default($nl, 'zmconv_microp');
add_default($nl, 'zmconv_num_cin');
add_default($nl, 'zmconv_dmpdz');
add_default($nl, 'zmconv_tiedke_add');
Expand Down Expand Up @@ -3963,7 +3959,6 @@ if ($dyn =~ /se/) {
se_kmin_jet
se_kmax_jet
se_molecular_diff
se_pgf_formulation
);

my %opts;
Expand Down
6 changes: 6 additions & 0 deletions bld/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,9 @@ if ($usr_cppdefs and $print>=2) { print "Commandline CPP definitions: \'$usr_cpp
# the CPP definitions that were explicitly set in the defaults file or by the user on the commandline.
my $cfg_cppdefs = ' ';

# Turn on CCPP "OLD_CAM"
$cfg_cppdefs .= " -DOLD_CAM";

# Building for perturbation growth tests
if ($pergro eq "ON") { $cfg_cppdefs .= " -DPERGRO"; }

Expand Down Expand Up @@ -2246,6 +2249,9 @@ sub write_filepath
# in the list of filepaths.
print $fh "$camsrcdir/src/physics/cam\n";

#Add the CCPP'ized subdirectories
print $fh "$camsrcdir/src/atmos_phys/zm\n";

# Dynamics package and test utilities
print $fh "$camsrcdir/src/dynamics/$dyn\n";
if($dyn eq 'se') {
Expand Down
19 changes: 3 additions & 16 deletions bld/namelist_files/namelist_defaults_cam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
<ncdata hgrid="mpasa120" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa120_L32_notopo_coords_c201216.nc</ncdata>
<ncdata hgrid="mpasa120" nlev="32" analytic_ic="1" phys="cam6" >atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc</ncdata>
<ncdata hgrid="mpasa120" nlev="32" analytic_ic="1" phys="cam_dev" >atm/cam/inic/mpas/mpasa120_L32_topo_coords_c201022.nc</ncdata>
<ncdata hgrid="mpasa60" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa60_L32_notopo_coords_c230707.nc</ncdata>
<ncdata hgrid="mpasa30" nlev="32" analytic_ic="1" >atm/cam/inic/mpas/mpasa30_L32_notopo_coords_c230707.nc</ncdata>

<!-- Files with initial conditions -->
<ncdata dyn="fv" hgrid="0.23x0.31" nlev="26" ic_ymd="101" >atm/cam/inic/fv/cami_0000-01-01_0.23x0.31_L26_c100513.nc</ncdata>
Expand Down Expand Up @@ -125,7 +123,7 @@
<ncdata dyn="se" hgrid="ne0np4CONUS.ne30x8" nlev="32" chem="trop_strat_mam4_vbs">atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc</ncdata>
<ncdata dyn="se" hgrid="ne0np4CONUS.ne30x8" nlev="32" chem="trop_strat_mam5_vbs">atm/cam/inic/se/f.e22.FCnudged.ne0CONUSne30x8_ne0CONUSne30x8_mt12.cam6_2_032.002.cam.i.2013-01-01-00000_c200623.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="58" chem="trop_strat_mam5_vbs">atm/cam/inic/se/f.e22.FCnudged.ne30_ne30_mg17.release-cesm2.2.0_spinup.2010_2020.001.cam.i.2011-01-01-00000_L58_c220310.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="93" chem="trop_strat_mam5_vbs">atm/cam/inic/se/f.cam6_3_112.FCMTHIST_v0c.ne30.non-ogw-ubcT-effgw0.7.001.cam.i.1998-01-01-00000_c230810.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="93" chem="trop_strat_mam5_vbs">atm/cam/inic/se/FCMTHIST_ne30pg3_1980-01-01_c221214.nc</ncdata>

<ncdata dyn="se" hgrid="ne30np4" npg="3" nlev="58">atm/cam/inic/se/FLT_L58_ne30pg3_IC_c220623.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" npg="3" nlev="93">atm/cam/inic/se/cam7_FMT_ne30pg3_mg17_L93_c221118.nc</ncdata>
Expand All @@ -140,8 +138,6 @@
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="70" aquaplanet="1" ic_ymd="20000101" >atm/waccm/ic/aqua.cam6.waccmsc_1.9x2.5_L70.2000-01-01.c170123.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="70" aquaplanet="1" ic_ymd="20000101" chem="waccm_tsmlt_mam4">atm/waccm/ic/aqua.waccm_tsmlt_1.9x2.5_L70_c170814.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="70" aquaplanet="1" ic_ymd="20000101" chem="waccm_ma_mam4">atm/waccm/ic/aqua.waccm_tsmlt_1.9x2.5_L70_c170814.nc</ncdata>
<ncdata dyn="se" hgrid="ne5np4" nlev="70" aquaplanet="1" chem="waccm_ma_mam4">atm/waccm/ic/aqua_waccm_ma_ne5np4_70L_c220729.nc</ncdata>
<ncdata dyn="se" hgrid="ne5np4" nlev="70" aquaplanet="1" chem="waccm_ma_mam5">atm/waccm/ic/aqua_waccm_ma_ne5np4_70L_c220729.nc</ncdata>
<ncdata dyn="fv" hgrid="4x5" nlev="70" ic_ymd="20000101" >atm/waccm/ic/f2000.waccm-mam3_4x5_L70.cam2.i.0017-01-01.c121113.nc</ncdata>
<ncdata dyn="fv" hgrid="10x15" nlev="70" ic_ymd="20000101" >atm/waccm/ic/f2000.waccm-mam3_10x15_L70.cam2.i.0017-01-01.c141016.nc</ncdata>
<ncdata dyn="fv" hgrid="1.9x2.5" nlev="70" ic_ymd="18500101" >atm/waccm/ic/b1850.waccm-mam3_1.9x2.5_L70.cam2.i.0156-01-01.c120523.nc</ncdata>
Expand Down Expand Up @@ -268,7 +264,7 @@
<ncdata dyn="se" hgrid="ne5np4" nlev="66" ic_ymd="101">atm/waccm/ic/wa3_ne5np4_1950_spinup.cam2.i.1960-01-01-00000_c150810.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="70" ic_ymd="101">atm/waccm/ic/FW2000_ne30_L70_01-01-0001_c200602.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="70" npg="3" chem="waccm_sc_mam4">atm/waccm/ic/FWsc2000climo_ne30pg3_L70_0002-01-01_c221103.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="70" npg="3" ic_ymd="101">atm/waccm/ic/FW2000.ne30pg3_ne30pg3_nlev70_c230906.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="70" npg="3" ic_ymd="101">atm/waccm/ic/FW2000_ne30pg3_L70_01-01-0001_c200602.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="110" ic_ymd="101">atm/waccm/ic/FWsc2000_ne30pg3_L110_01-01-0001_c200521.nc</ncdata>

<ncdata dyn="se" hgrid="ne0np4CONUS.ne30x8" nlev="70" ic_ymd="101">atm/waccm/ic/FW2000_CONUS_30x8_L70_01-01-0001_c200602.nc</ncdata>
Expand Down Expand Up @@ -2119,9 +2115,7 @@
<clubb_tridiag_solve_method > 1 </clubb_tridiag_solve_method>
<clubb_up2_sfc_coef > 2.0 </clubb_up2_sfc_coef>
<clubb_wpxp_L_thresh > 60.0 </clubb_wpxp_L_thresh>
<do_hb_above_clubb >.false. </do_hb_above_clubb>
<do_hb_above_clubb phys="cam_dev" >.true. </do_hb_above_clubb>
<do_hb_above_clubb phys="cam6" >.true. </do_hb_above_clubb>

<!-- SILHS options -->
<clubb_do_icesuper silhs="1" > .true. </clubb_do_icesuper>
<clubb_C2rt silhs="1" > 0.2 </clubb_C2rt>
Expand Down Expand Up @@ -2773,7 +2767,6 @@
<zmconv_org > .false. </zmconv_org>
<zmconv_org zmconv_org="1" > .true. </zmconv_org>

<zmconv_microp > .false. </zmconv_microp>
<zmconv_num_cin > 5 </zmconv_num_cin>
<zmconv_num_cin phys="cam6" > 1 </zmconv_num_cin>
<zmconv_num_cin phys="cam_dev" > 1 </zmconv_num_cin>
Expand Down Expand Up @@ -3015,8 +3008,6 @@
<!-- Defaults for SE -->
<!-- ================================================================== -->

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

<se_large_Courant_incr > .true. </se_large_Courant_incr>
Expand Down Expand Up @@ -3123,8 +3114,6 @@
<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="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>
Expand All @@ -3139,8 +3128,6 @@

<mpas_len_disp hgrid="mpasa480">480000.0D0</mpas_len_disp>
<mpas_len_disp hgrid="mpasa120">120000.0D0</mpas_len_disp>
<mpas_len_disp hgrid="mpasa60"> 60000.0D0</mpas_len_disp>
<mpas_len_disp hgrid="mpasa30"> 30000.0D0</mpas_len_disp>

<mpas_visc4_2dsmag > 0.05D0 </mpas_visc4_2dsmag>
<mpas_del4u_div_factor > 10.0D0 </mpas_del4u_div_factor>
Expand Down
26 changes: 1 addition & 25 deletions bld/namelist_files/namelist_definition.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3197,12 +3197,6 @@ if -zmconv_org is set in configure.
Default: .false., unless -zmconv_org set in configure
</entry>

<entry id="zmconv_microp" type="logical" category="conv"
group="zmconv_nl" valid_values="" >
Turn on convective microphysics
Default: .false.
</entry>

<entry id="zmconv_num_cin" type="integer" category="conv"
group="zmconv_nl" valid_values="" >
The number of negative buoyancy regions that are allowed before the convection top and CAPE calculations are completed.
Expand Down Expand Up @@ -5169,13 +5163,6 @@ Bretherton; 'HBR' for Rasch modified version of 'HB'.
Default: set by build-namelist
</entry>

<entry id="do_hb_above_clubb" type="logical" category="pbl"
group="phys_ctl_nl" valid_values="" >
Logical: If True activate Holtslag and Boville vertical diffusion scheme where CLUBB is not active
(note that CLUBB top is dynamic in each column)
Default: Set by build-namelist.
</entry>

<!-- Convective Scavenging -->

<entry id="convproc_do_aer" type="logical" category="conv"
Expand Down Expand Up @@ -5588,7 +5575,7 @@ Default: false
<!-- Aerosol and cloud optics -->

<entry id="water_refindex_file" type="char*256" input_pathname="abs" category="radiation"
group="aerosol_optics_nl" valid_values="" >
group="modal_aer_opt_nl" valid_values="" >
Full pathname of dataset for water refractive indices used in modal aerosol optics
Default: none
</entry>
Expand Down Expand Up @@ -8149,17 +8136,6 @@ Normally equal to se_vert_num_threads.
Default: Set by build-namelist.
</entry>

<entry id="se_pgf_formulation" type="integer" category="se"
group="dyn_se_inparm" valid_values="1,2" >

1: Exner version of pressure gradient force (PGF)
see Appendix A in https://agupubs.onlinelibrary.wiley.com/doi/epdf/10.1029/2022MS003192

2: Traditional pressure gradient formulation (grad p)

Default: Set by build-namelist.
</entry>


<!-- MPAS dycore -->

Expand Down
Loading

0 comments on commit 682234a

Please sign in to comment.