Skip to content
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.

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

cam6_4_067: Remove SPCAM #1217

Merged
merged 9 commits into from
Feb 15, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
remove namelist options for SPCAM
brian-eaton committed Dec 31, 2024
commit 9c4d5ca9d0113759b039180af4e67de7a85967c8
7 changes: 1 addition & 6 deletions bld/build-namelist
Original file line number Diff line number Diff line change
@@ -3683,7 +3683,7 @@ if ($cfg->get('microphys') eq 'rk') {
}

# Eddy Diffusivity Adjustments
if ($cfg->get('pbl') eq "uw" or $cfg->get('pbl') eq "spcam_m2005") {
if ($cfg->get('pbl') eq "uw") {
add_default($nl, 'kv_top_pressure');
add_default($nl, 'kv_top_scale');
add_default($nl, 'kv_freetrop_scale');
@@ -4349,11 +4349,6 @@ if ($offline_drv ne 'stub') {
}
}

if ($phys eq 'spcam_sam1mom' or $phys eq 'spcam_m2005') {
add_default($nl, 'iradsw', 'val'=>'1');
add_default($nl, 'iradlw', 'val'=>'1');
}

#-----------------------------------------------------------------------------------------------
# Rename component logfiles.
#
39 changes: 2 additions & 37 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
@@ -354,8 +354,6 @@
<scale_dry_air_mass phys="cam5" > 98288.0D0 </scale_dry_air_mass>
<scale_dry_air_mass phys="cam6" > 98288.0D0 </scale_dry_air_mass>
<scale_dry_air_mass phys="cam7" > 98288.0D0 </scale_dry_air_mass>
<scale_dry_air_mass phys="spcam_m2005" > 98288.0D0 </scale_dry_air_mass>
<scale_dry_air_mass phys="spcam_sam1mom" > 98288.0D0 </scale_dry_air_mass>

<!-- Ridge parameterization (gamma) -->
<bnd_rdggm hgrid="0.9x1.25">atm/cam/topo/fv_0.9x1.25_nc3000_Nsw006_Nrs002_Co008_Fi001_ZR_c160505.nc</bnd_rdggm>
@@ -1988,8 +1986,6 @@

<!-- rain out method -->
<gas_wetdep_method>NEU</gas_wetdep_method>
<gas_wetdep_method phys="spcam_sam1mom" >MOZ</gas_wetdep_method>
<gas_wetdep_method phys="spcam_m2005" >OFF</gas_wetdep_method>

<!-- Dry Dep surface data file needed by prognostic MAM on unstructured grid only. -->

@@ -2066,7 +2062,6 @@
<do_tms phys="cam5" > .true. </do_tms>
<do_tms phys="cam6" > .false. </do_tms>
<do_tms phys="cam7" > .false. </do_tms>
<do_tms phys="spcam_m2005" > .true. </do_tms>

<tms_z0fac > 0.075D0 </tms_z0fac>
<tms_z0fac hgrid="48x96" > 0.100D0 </tms_z0fac>
@@ -2084,22 +2079,19 @@
<do_iss phys="cam5" > .true. </do_iss>
<do_iss phys="cam6" > .true. </do_iss>
<do_iss phys="cam7" > .true. </do_iss>
<do_iss phys="spcam_m2005" > .true. </do_iss>

<!-- Use convective water in radiation calculation -->
<conv_water_in_rad > 0 </conv_water_in_rad>
<conv_water_in_rad phys="cam5" > 1 </conv_water_in_rad>
<conv_water_in_rad phys="cam6" > 1 </conv_water_in_rad>
<conv_water_in_rad phys="cam7" > 1 </conv_water_in_rad>
<conv_water_in_rad phys="spcam_m2005"> 1 </conv_water_in_rad>

<conv_water_frac_limit > 0.01d0 </conv_water_frac_limit>
<conv_water_frac_limit unicon="1" > 0.001d0 </conv_water_frac_limit>

<!-- CLUBB_SGS -->
<do_clubb_sgs > .false. </do_clubb_sgs>
<do_clubb_sgs clubb_sgs="1" > .true. </do_clubb_sgs>
<do_clubb_sgs spcam_clubb_sgs="1" > .true. </do_clubb_sgs>

<!-- CLUBB_history -->
<clubb_history > .false. </clubb_history>
@@ -2309,10 +2301,8 @@
<microp_scheme microphys="rk" >RK </microp_scheme>
<microp_scheme microphys="mg1" >MG </microp_scheme>
<microp_scheme microphys="mg2" >MG </microp_scheme>
<microp_scheme microphys="spcam_m2005" >SPCAM_m2005 </microp_scheme>
<microp_scheme microphys="spcam_sam1mom">SPCAM_sam1mom</microp_scheme>
<microp_scheme microphys="mg3">MG</microp_scheme>
<microp_scheme microphys="pumas">MG</microp_scheme>
<microp_scheme microphys="mg3" >MG </microp_scheme>
<microp_scheme microphys="pumas" >MG </microp_scheme>

<micro_mg_version microphys="mg1"> 1 </micro_mg_version>
<micro_mg_sub_version microphys="mg1"> 0 </micro_mg_sub_version>
@@ -2438,8 +2428,6 @@
<macrop_scheme macrophys="rk" >rk</macrop_scheme>
<macrop_scheme macrophys="park" >park</macrop_scheme>
<macrop_scheme macrophys="clubb_sgs" >CLUBB_SGS</macrop_scheme>
<macrop_scheme macrophys="spcam_sam1mom" >SPCAM_sam1mom</macrop_scheme>
<macrop_scheme macrophys="spcam_m2005" >SPCAM_m2005</macrop_scheme>

<!-- Vertical limit on troposphere cloud physics -->

@@ -2487,9 +2475,7 @@
<!-- dust emission tuning factor -->
<dust_emis_fact >0.37D0</dust_emis_fact>
<dust_emis_fact phys="cam5" >0.35D0</dust_emis_fact>
<dust_emis_fact phys="spcam_m2005" >0.35D0</dust_emis_fact>
<dust_emis_fact hgrid="0.47x0.63" phys="cam5" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.47x0.63" phys="spcam_m2005" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.23x0.31" phys="cam5" >0.45D0</dust_emis_fact>
<dust_emis_fact phys="cam6" >0.35D0</dust_emis_fact>
<dust_emis_fact phys="cam7" >1.30D0</dust_emis_fact>
@@ -2499,7 +2485,6 @@
<dust_emis_fact hgrid="0.47x0.63" phys="cam7" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.23x0.31" phys="cam6" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.23x0.31" phys="cam7" >0.45D0</dust_emis_fact>
<dust_emis_fact hgrid="0.23x0.31" phys="spcam_m2005" >0.45D0</dust_emis_fact>

<dust_emis_fact dyn="se" phys="cam5" >0.55D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="cam5" clubb_sgs="1" >0.22D0</dust_emis_fact>
@@ -2527,7 +2512,6 @@
<dust_emis_fact dyn="se" hgrid="ne0np4CONUS.ne30x8" phys="cam7" waccm_phys="1">0.8D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="cam6" >0.70D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="cam7" >0.70D0</dust_emis_fact>
<dust_emis_fact dyn="fv" phys="spcam_m2005" spcam_clubb_sgs="1">0.13D0</dust_emis_fact>

<dust_emis_fact hgrid="1.9x2.5" phys="cam6" ver="chem">0.26D0</dust_emis_fact>
<dust_emis_fact hgrid="1.9x2.5" phys="cam7" ver="chem">0.26D0</dust_emis_fact>
@@ -2550,7 +2534,6 @@
<seasalt_emis_scale ver="strat" clubb_sgs="1" >1.00D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" phys="cam7" >0.75D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" hgrid="1.9x2.5" phys="cam6">1.10D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" spcam_clubb_sgs="1" >1.2D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" silhs="1" >0.60D0</seasalt_emis_scale>

<!-- Wet scavenging of modal aerosols -->
@@ -2565,9 +2548,6 @@
<sol_factic_interstitial >0.4D0</sol_factic_interstitial>
<sol_factic_interstitial unicon="1" >1.0D0</sol_factic_interstitial>

<seasalt_emis_scale spcam_clubb_sgs="1" phys="spcam_sam1mom" >1.00D0</seasalt_emis_scale >
<seasalt_emis_scale spcam_clubb_sgs="1" phys="spcam_m2005" >1.00D0</seasalt_emis_scale >

<!-- sub-column switches for physics packages -->
<use_subcol_microp >.false.</use_subcol_microp>
<use_subcol_microp silhs="1" >.true.</use_subcol_microp>
@@ -2630,25 +2610,19 @@
<eddy_scheme pbl="hb" >HB </eddy_scheme>
<eddy_scheme pbl="hbr" >HBR </eddy_scheme>
<eddy_scheme pbl="clubb_sgs" >CLUBB_SGS </eddy_scheme>
<eddy_scheme pbl="spcam_m2005" >SPCAM_m2005 </eddy_scheme>
<eddy_scheme pbl="spcam_sam1mom" >SPCAM_sam1mom </eddy_scheme>

<!-- convection schemes -->
<deep_scheme >ZM </deep_scheme>
<deep_scheme silhs="1" >off </deep_scheme>
<deep_scheme unicon="1" >UNICON </deep_scheme>
<deep_scheme pbl="none" >NONE </deep_scheme>
<deep_scheme phys='spcam_sam1mom'>SPCAM </deep_scheme>
<deep_scheme phys='spcam_m2005' >SPCAM </deep_scheme>

<shallow_scheme pbl="none" >NONE </shallow_scheme>
<shallow_scheme pbl="uw" >UW </shallow_scheme>
<shallow_scheme pbl="uw" unicon="1">UNICON </shallow_scheme>
<shallow_scheme pbl="hb" >Hack </shallow_scheme>
<shallow_scheme pbl="hbr" >Hack </shallow_scheme>
<shallow_scheme pbl="clubb_sgs" >CLUBB_SGS</shallow_scheme>
<shallow_scheme pbl="spcam_m2005" >SPCAM </shallow_scheme>
<shallow_scheme pbl="spcam_sam1mom">SPCAM </shallow_scheme>

<!-- Cloud fraction -->
<cldfrc_freeze_dry >.true.</cldfrc_freeze_dry>
@@ -2774,10 +2748,8 @@
<cldfrc2m_rhmaxi > 1.1D0 </cldfrc2m_rhmaxi>
<cldfrc2m_rhmaxi clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxi>
<cldfrc2m_rhmaxi clubb_sgs="1" silhs="1" > 1.05D0 </cldfrc2m_rhmaxi>
<cldfrc2m_rhmaxi spcam_clubb_sgs="1" > 1.0D0 </cldfrc2m_rhmaxi>
<cldfrc2m_rhmaxis > 1.1D0 </cldfrc2m_rhmaxis>
<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_max >5.e-3 </cldfrc2m_qist_max>
@@ -2937,19 +2909,14 @@
<fv_div24del2flag phys="cam5" > 4</fv_div24del2flag>
<fv_div24del2flag phys="cam6" > 4</fv_div24del2flag>
<fv_div24del2flag phys="cam7" > 4</fv_div24del2flag>
<fv_div24del2flag phys="spcam_m2005" > 4</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="cam4" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="spcam_sam1mom">42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="cam4" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="spcam_sam1mom">42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="cam5" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="spcam_m2005" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="cam5" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="cam6" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.23x0.31" phys="cam7" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="cam6" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="cam7" >42</fv_div24del2flag>
<fv_div24del2flag hgrid="0.47x0.63" phys="spcam_m2005" >42</fv_div24del2flag>

<fv_nspltvrm >1</fv_nspltvrm>
<fv_nspltvrm hgrid="0.9x1.25" >2</fv_nspltvrm>
@@ -3181,8 +3148,6 @@
<water_species_in_air microphys="none" phys="held_suarez">'Q' </water_species_in_air>
<water_species_in_air microphys="none" phys="kessler" >'Q','CLDLIQ','RAINQM' </water_species_in_air>
<water_species_in_air microphys="rk" >'Q','CLDLIQ','CLDICE' </water_species_in_air>
<water_species_in_air microphys="spcam_m2005" >'Q','CLDLIQ','CLDICE' </water_species_in_air>
<water_species_in_air microphys="spcam_sam1mom" >'Q','CLDLIQ','CLDICE' </water_species_in_air>
<water_species_in_air microphys="mg1" >'Q','CLDLIQ','CLDICE' </water_species_in_air>
<water_species_in_air microphys="mg2" >'Q','CLDLIQ','CLDICE','RAINQM','SNOWQM' </water_species_in_air>
<water_species_in_air microphys="mg3" >'Q','CLDLIQ','CLDICE','RAINQM','SNOWQM','GRAUQM'</water_species_in_air>
14 changes: 5 additions & 9 deletions bld/namelist_files/namelist_definition.xml
Original file line number Diff line number Diff line change
@@ -3581,16 +3581,14 @@ Default: 10
group="phys_ctl_nl" valid_values="ZM,UNICON,off,CLUBB_SGS" >
Type of deep convection scheme employed. 'ZM' for Zhang-McFarlane;
'off' for none; or 'UNICON' which doesn't distinquish shallow and deep.
Default: 'ZM' unless using 'UNICON', 'SPCAM' or 'pbl=none'
Default: 'ZM' unless using 'UNICON' or 'pbl=none'
</entry>

<entry id="microp_scheme" type="char*16" category="conv"
group="phys_ctl_nl" valid_values="NONE,RK,MG,SPCAM_m2005,SPCAM_sam1mom" >
group="phys_ctl_nl" valid_values="NONE,RK,MG" >
Type of microphysics scheme employed. 'RK' for Rasch and Kristjansson
(1998); 'MG' for Morrison and Gettelman (2008), Gettelman et al (2010)
two moment scheme for CAM5 and CAM6
SPCAM has two different microphysics schemes: SPCAM_m2005 (Morrison et al 2005),
SPCAM_sam1mom (Khairoutinov 2003)
Default: set by build-namelist (depends on value set in configure).
</entry>

@@ -3610,14 +3608,12 @@ Default: set by build-namelist
</entry>

<entry id="shallow_scheme" type="char*16" category="conv"
group="phys_ctl_nl" valid_values="Hack,UW,CLUBB_SGS,UNICON,SPCAM_m2005,SPCAM_sam1mom" >
group="phys_ctl_nl" valid_values="Hack,UW,CLUBB_SGS,UNICON" >
Type of shallow convection scheme employed.
'Hack' for Hack shallow convection;
'UW' for original McCaa UW pbl scheme, modified by Sungsu Park;
'CLUBB_SGS' for CLUBB_SGS
'UNICON' which doesn't distinquish shallow and deep.
'SPCAM_m2005' for SPCAM double moment
'SPCAM_sam1mom' for SPCAM single moment
Default: set by build-namelist (depends on {{ hilight }}eddy_scheme{{ closehilight }}).
</entry>

@@ -5323,7 +5319,7 @@ Default: 0
</entry>

<entry id="eddy_scheme" type="char*16" category="pbl"
group="phys_ctl_nl" valid_values="HB,diag_TKE,HBR,CLUBB_SGS,SPCAM_sam1mom,SPCAM_m2005" >
group="phys_ctl_nl" valid_values="HB,diag_TKE,HBR,CLUBB_SGS" >
Type of eddy scheme employed by the vertical diffusion package. 'HB' for
Holtslag and Boville; 'diag_TKE' for diagnostic tke version of Grenier and
Bretherton; 'HBR' for Rasch modified version of 'HB'.
@@ -6142,7 +6138,7 @@ Wet deposition method used
MOZ --> mozart scheme is used
NEU --> J Neu's scheme is used
OFF --> wet deposition is turned off
Default: NEU except for SPCAM runs
Default: NEU
</entry>

<entry id="gas_wetdep_list" type="char*16(1000)" category="cam_chem"
12 changes: 12 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -36,6 +36,9 @@ List all files added and what they do:

List all existing files that have been modified, and describe the changes:

bld/build-namelist
. remove dependencies on spcam

bld/config_files/definition.xml
. remove 'phys' options spcam_sam1mom and spcam_m2005
. remove 'microphys' options spcam_sam1mom and spcam_m2005
@@ -59,6 +62,15 @@ bld/configure
src/physics/spcam/crm/SGS_TKE/
src/physics/spcam/ecpp/

bld/namelist_files/namelist_defaults_cam.xml
. remove dependencies on phys, microphys, macrophys, and pbl attributes
spcam_sam1mom and spcam_m2005
. remove dependencies on spcam_clubb_sgs attribute

bld/namelist_files/namelist_definition.xml
. remove SPCAM_sam1mom and SPCAM_m2005 as valid values for microp_scheme,
shallow_scheme, and eddy_scheme

cime_config/config_component.xml
. remove physics options %SPCAMS, %SPCAMCLBS, %SPCAMM, %SPCAMCLBM