Skip to content

Add F-compset CAM4 compsets/tests, and cleanup config_*.xml files. #544

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.

Sign up for GitHub

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

Merged
nusbaume merged 5 commits into from
Aug 24, 2026
Merged

Add F-compset CAM4 compsets/tests, and cleanup config_*.xml files. #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01e47ed
Add F1850_C4 compset.
nusbaume Jul 13, 2026
48b78e2
Update physics external to get CAM4 fixes, and cleanup config_comp*.x…
nusbaume Aug 13, 2026
00cca2a
Add F-compset CAM4 tests, and replace tabs with spaces in config_*.xm…
nusbaume Aug 18, 2026
13acceb
Merge remote-tracking branch 'upstream/development' into cam4_f_compset
nusbaume Aug 23, 2026
e71323e
Update atmospheric_physics external tag.
nusbaume Aug 24, 2026
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_28_000
fxtag = atmos_phys0_28_001
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "rrtmgp-data"]
Expand Down
218 changes: 15 additions & 203 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,55 +8,12 @@
CAM
===============
-->
<desc atm="CAM70[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE]">CAM cam7 physics:</desc>
<desc atm="CAM60[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE]">CAM cam6 physics:</desc>
<desc atm="CAM50[%CCTS][%CLB][%PORT][%RCO2][%SCAM][%SDYN][%WCSC][%WCTS]" >CAM cam5 physics:</desc>
<desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WXIE][%WXIED][%WCMD]" >CAM cam4 physics:</desc>
<desc atm="CAM[%ADIAB][%PHYSTEST][%DABIP04][%TJ16][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]">CAM simplified and non-versioned physics:</desc>
<desc atm="CAM%MPASCP">CAM with MPAS-like "convection-permitting" physics suite (EXPERIMENTAL)</desc>

<!--
===============
CAM and WACCM Options
===============
-->
<desc option="4xCO2" >abrupt quadrupling of CO2 with other forcings maintained at 1850 piControl levels (CMIP6 DECK abrupt4xCO2 experiment) :</desc>
<desc option="1PCT" >ramped CO2 increasing by 1% per year with other forcings maintained at 1850 piControl levels (CMIP6 DECK 1pctCO2 experiment) :</desc>

<!--
===============
SINGLE COLUMN CAM
===============
-->
<desc atm="CAM[456]0%SCAM" >CAM stand-alone single column mode -- need to define usermods directory with IOP settings:</desc>
<desc atm="%SDYN" >CAM winds and temperature nudged towards prescribed meteorology:</desc>
<!--
===============
CAM Options
===============
-->
<desc option="CCTS" >CAM-Chem troposphere/stratosphere chem with simplified volatility basis set SOA scheme and modal aersols :</desc>
<desc option="CFIRE" >CAM-Chem troposphere/stratosphere chem with simplified volatility basis set SOA scheme and fire emissons :</desc>
<desc option="CLB" >CAM CLUBB - turned on by default in CAM60:</desc>
<desc option="CVBSX" >CAM-Chem troposphere/stratosphere chem with extended volatility basis set SOA scheme and modal aersols :</desc>
<desc option="RCO2" >CAM CO2 ramp: </desc>
<desc option="SPCAMS" >CAM super-parameterized CAM one moment SAM microphysics </desc>
<desc option="SPCAMCLBS" >CAM super-parameterized CAM one moment SAM microphysics using CLUBB </desc>
<desc option="SPCAMM" >CAM super-parameterized CAM double moment m2005 SAM microphysics </desc>
<desc option="SPCAMCLBM" >CAM super-parameterized CAM double moment m2005 SAM microphysics using CLUBB </desc>
<desc option="TMOZ" >CAM tropospheric chemistry with bulk aerosols:</desc>

<!--
===============
WACCM Options
===============
-->
<desc option="WCCM" >WACCM with middle atmosphere chemistry:</desc>
<desc option="WCMD" >WACCM with middle atmosphere chemistry with enhanced D-region ion chemistry:</desc>
<desc option="WXIE" >WACCM-X enhanced ionosphere, transport, and electrodynamics:</desc>
<desc option="WXIED" >WACCM-X enhanced ionosphere, transport, and electrodynamics with D-region ion chemistry:</desc>
<desc option="WCSC" >WACCM specified chemistry:</desc>
<desc option="WCTS" >WACCM with tropospheric, stratospheric, mesospheric, and lower thermospheric chemistry:</desc>
<desc atm="CAM70">CAM-SIMA with cam7 physics:</desc>
<desc atm="CAM60">CAM-SIMA with cam6 physics:</desc>
<desc atm="CAM50">CAM-SIMA with cam5 physics:</desc>
<desc atm="CAM40">CAM-SIMA with cam4 physics:</desc>
<desc atm="CAM[%ADIAB][%PHYSTEST][%DABIP04][%TJ16][%HS94][%KESSLER]">CAM-SIMA simplified and non-versioned physics:</desc>
<desc atm="CAM%MPASCP">CAM-SIMA with MPAS-like "convection-permitting" physics suite (EXPERIMENTAL)</desc>

<!--
===============
Expand All @@ -67,14 +24,7 @@
<desc option="DABIP04" >CAM dry adiabatic baroclinic instability (Polvani et al., 2004):</desc>
<desc option="TJ16" >CAM moist Held-Suarez forcing (Thatcher and Jablonowski, 2016):</desc>
<desc option="HS94" >CAM dry Held-Suarez forcing (Held and Suarez (1994)):</desc>
<desc option="KESSLER" >CAM moist dynamical core test with Ullrich et al. (2014) baroclinic wave IC, Kessler physics and terminator chemistry:</desc>

<!--
===============
PORT
===============
-->
<desc option="PORT" >CAM Parallel Offline Radiation Tool:</desc>
<desc option="KESSLER" >CAM moist dynamical core test with Ullrich et al. (2014) baroclinic wave IC, Kessler physics:</desc>

<!--
===============
Expand Down Expand Up @@ -105,10 +55,9 @@

<entry id="CAM_DYCORE">
<type>char</type>
<valid_values>eul,fv,mpas,se,none</valid_values>
<default_value>fv</default_value>
<valid_values>mpas,se,none</valid_values>
<default_value>none</default_value>
Comment thread
jimmielin marked this conversation as resolved.
<values match="last">
<value grid="a%T[1-9]">eul</value>
<value grid="a%mpasa[0-9]+">mpas</value>
<value grid="a%ne[0-9]">se</value>
</values>
Expand All @@ -127,44 +76,11 @@
<!-- <value compset="_CAM50">-phys cam5</value>
<value compset="_CAM60">-phys cam6</value> -->

<!-- Modifiers for CAM runs -->
<!-- <value compset="_(CAM50|CAM60)%(CCTS|CFIRE)">-chem trop_strat_mam4_vbs</value>
<value compset="CAM60%CVBSX">-chem trop_strat_mam4_vbsext</value>
<value compset="_CAM50%CLB">-clubb_sgs</value>
<value compset="_(CAM40|CAM50|CAM60)%SCAM">-dyn eul -scam</value>
<value compset="CAM%SPCAMS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom </value>
<value compset="CAM%SPCAMCLBS">-rad camrt -chem none -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_sam1mom -spcam_clubb_sgs </value>
<value compset="CAM%SPCAMM">-rad rrtmg -chem trop_mam3 -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_m2005 </value>
<value compset="CAM%SPCAMCLBM">-rad rrtmg -chem trop_mam3 -spcam_nx 32 -spcam_ny 1 -spcam_dx 4000 -spcam_dt 20 -phys spcam_m2005 -spcam_clubb_sgs </value>
<value compset="_CAM40%TMOZ">-chem trop_mozart</value>

<value compset="_CAM.*_BGC%B">-co2_cycle</value> -->

<!-- Match against "%WC" to set defaults for all WACCM cases. -->
<!-- Later settings of "-chem" take precedence over earlier ones. -->
<!-- <value compset="_(CAM50|CAM60)%(WC|CC|CV|CF)">-age_of_air_trcs</value>
<value compset="_CAM40%WCCM">-chem waccm_ma</value>
<value compset="_(CAM50|CAM60)%WCCM">-chem waccm_ma_mam4</value>
<value compset="_(CAM50|CAM60)%WCMD">-chem waccm_mad_mam4</value>
<value compset="_(CAM50|CAM60)%WCSC">-chem waccm_sc_mam4</value>
<value compset="_(CAM50|CAM60)%WCTS">-chem waccm_tsmlt_mam4</value>
<value compset="_CAM40%WX">-waccmx</value>
<value compset="_CAM\d0%WXIE">-ionosphere wxie</value>
<value compset="_CAM40%WXIE">-chem waccm_ma</value>
<value compset="_CAM40%WXIED">-chem waccm_mad</value>
<value compset="_CAM40%WCMD">-chem waccm_mad</value>
<value compset="_CAM60%WX">-chem waccm_ma_mam4 -waccmx</value>

<value compset="_CAM.*%SDYN">-offline_dyn</value>
<value compset="_CAM\d0%SDYN_CLM">-nlev 56</value>
<value compset="_CAM\d0%CC.*%SDYN">-nlev 56</value>
<value compset="_CAM\d0%WC.*%SDYN">-nlev 88</value>
<value compset="_CAM\d0%WX.*%SDYN">-nlev 145</value> -->
<!-- <value compset="_CAM.*_BGC%B">-co2_cycle</value> -->

<!-- Simple models -->
<value compset="_CAM%ADIAB">--physics-suites adiabatic</value>
<value compset="_CAM%TJ16">--physics-suites tj2016 --analytic-ic</value>
<!-- <value compset="_CAM%KESSLER">-phys kessler -chem terminator -analytic_ic</value> -->
<value compset="_CAM%KESSLER">--physics-suites kessler --analytic-ic</value>
<value compset="_CAM%HS94">--physics-suites held_suarez_1994 --analytic-ic</value>
<value compset="_CAM%PHYSTEST">--dyn none --physics-suites adiabatic</value>
Expand All @@ -173,133 +89,29 @@
<value compset="_DOCN%SOMAQP">--aquaplanet</value>
<value compset="_DOCN%AQP" >--aquaplanet</value>

<!-- PORT -->
<!-- <value compset="%PORT">-offline_drv rad</value> -->

<!-- CAM with MPAS-like "convection-permitting" physics suite (EXPERIMENTAL) -->
<!-- Temporarily using analytic initial condition during development -->
<value compset="CAM%MPASCP">--physics-suites convection_permitting --analytic-ic</value>
</values>
<group>build_component_cam</group>
<file>env_build.xml</file>
<desc>
CAM configure options, see CAM configure utility for details
Provides option(s) for the CAM configure utility.
CAM_CONFIG_OPTS are normally set as compset variables (e.g., -phys cam4 -chem waccm_ma)
CAM-SIMA configure options
Provides option(s) for the CAM-SIMA configuration system.
CAM_CONFIG_OPTS are normally set as compset variables (e.g., --physics-suites cam4 --dyn mpas)
and in general should not be modified for supported compsets. It is recommended that if you want
to modify this value for your experiment, you should use your own user-defined
component sets via using create_newcase with a compset_file argument
</desc>
</entry>

<entry id="CAM_NML_USE_CASE">
<type>char</type>
<valid_values></valid_values>
<default_value>UNSET</default_value>
<values match="last">
<value compset="1850_CAM40" >1850_cam4</value>
<value compset="1850_CAM50" >1850_cam5</value>

<value compset="1850_CAM60" >1850_cam6</value>
<value compset="1850_CAM60%WCTS" >waccm_tsmlt_1850_cam6</value>
<value compset="1850_CAM60%WCCM" >waccm_ma_1850_cam6</value>
<value compset="1850_CAM60%WCSC" >waccm_sc_1850_cam6</value>

<value compset="2000_CAM40%TMOZ" >2000_cam4_trop_chem</value>
<value compset="2000_CAM40%WXIE" >waccmxie_ma_2000_cam4</value>

<value compset="2000_CAM60" >2000_cam6</value>
<value compset="2000_CAM60%WCTS" >waccm_tsmlt_2000_cam6</value>
<value compset="2000_CAM60%WCCM" >waccm_ma_2000_cam6</value>
<value compset="2000_CAM60%WCSC" >waccm_sc_2000_cam6</value>
<value compset="2000_CAM60%CCTS" >2000_trop_strat_vbs_cam6</value>
<value compset="2000_CAM60%WXIE" >waccmx_ma_2000_cam6</value>

<value compset="2000_CAM40_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam4</value>
<value compset="2000_CAM40_SLND_SICE_DOCN%AQP" >aquaplanet_cam4</value>
<value compset="2000_CAM50_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam5</value>
<value compset="2000_CAM50_SLND_SICE_DOCN%AQP" >aquaplanet_cam5</value>
<value compset="2000_CAM60_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam6</value>
<value compset="2000_CAM60_SLND_SICE_DOCN%AQP" >aquaplanet_cam6</value>

<value compset="2010_CAM60" >2010_cam6</value>
<value compset="2010_CAM60%CCTS" >2010_trop_strat_vbs_cam6</value>
<value compset="2010_CAM60%WCTS" >waccm_tsmlt_2010_cam6</value>
<value compset="2010_CAM60%WCSC" >waccm_sc_2010_cam6</value>

<value compset="AMIP_CAM50" >1850-2005_cam5</value>
<value compset="AMIP_CAM40" >1850-2005_cam4</value>

<value compset="HIST_CAM40" >1850-2005_cam4</value>
<value compset="HIST_CAM40.*_BGC%B">1850-2005_cam4_bgc</value>
<value compset="HIST_CAM40%WXIE" >1950-2010_ccmi_refc1_waccmx_ma</value>
<value compset="HIST_CAM50" >1850-2005_cam5</value>
<value compset="HIST_CAM60" >hist_cam6</value>
<value compset="HIST_CAM60%WCTS" >waccm_tsmlt_hist_cam6</value>
<value compset="HIST_CAM60%WCSC" >waccm_sc_hist_cam6</value>
<value compset="HIST_CAM60%WCCM" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
<value compset="HIST_CAM60%CCTS" >hist_trop_strat_vbs_cam6</value>
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
<value compset="HIST_CAM60%WXIE" >waccmx_ma_hist_cam6</value>

<value compset="PIPD_CAM50" >1850-PD_cam5</value>

<value compset="RCP2_CAM40" >2005-2100_cam4_rcp26</value>
<value compset="RCP4_CAM40" >2005-2100_cam4_rcp45</value>
<value compset="RCP4_CAM40.*_BGC%B">2005-2100_cam4_rcp45_bgc</value>
<value compset="RCP6_CAM40" >2005-2100_cam4_rcp60</value>
<value compset="RCP8_CAM40" >2005-2100_cam4_rcp85</value>
<value compset="RCP8_CAM40.*_BGC%B">2005-2100_cam4_rcp85_bgc</value>

<value compset="RCP2_CAM50" >2006-2100_cam5_rcp26</value>
<value compset="RCP4_CAM50" >2006-2100_cam5_rcp45</value>
<value compset="RCP6_CAM50" >2006-2100_cam5_rcp60</value>
<value compset="RCP8_CAM50" >2006-2100_cam5_rcp85</value>

<value compset="_CAM40%WXIED%SDYN" >sd_waccmx_ma_cam4</value>
<value compset="_CAM40%WXIE%SDYN" >sd_waccmx_ma_cam4</value>
<value compset="_CAM60%WXIE%SDYN" >sd_waccmx_ma_cam6</value>
<value compset="_CAM60%WCTS%SDYN" >sd_waccm_tsmlt_cam6</value>
<value compset="_CAM60%WCCM%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM60%WCMD%SDYN" >sd_waccm_ma_cam6</value>
<value compset="_CAM40%WCMD%SDYN" >sd_waccm_ma_cam4</value>
<value compset="_CAM60%CCTS%SDYN" >sd_trop_strat_vbs_cam6</value>
<value compset="_CAM60%SDYN_CLM50" >sd_cam6</value>

<value compset="2000_CAM%DABIP04" >dabi_p2004</value>
<value compset="CAM%HS94" >held_suarez_1994</value>
<value compset="CAM%TJ16" >dctest_tj2016</value>
<value compset="CAM%KESSLER" >dctest_baro_kessler</value>

<!-- SCAM defaults to ARM97, all other IOPs are in usermods_dirs -->
<value compset="CAM[456]0%SCAM" >scam_arm97</value>
</values>
<group>run_component_cam</group>
<file>env_run.xml</file>
<desc>CAM namelist use_case. Provides the use_case option for the
CAM build-namelist utility (which is called from
$CASEROOT/Buildconf/cam.buildnml). The CAM build-namelist
leverages groups of namelist options (use cases) that are often
paired with the CAM configure options. These use cases are xml
files located in
$CIMEROOT/../components/atm/cam/bld/namelist_files/use_cases.
In general, this variable should not be modified for supported
component sets (compsets). Recommendation: If you want to
modify this value for your experiment, use your own user-defined
component sets.</desc>
</entry>

<entry id="CAM_USER_MODS">
<type>char</type>
<valid_values></valid_values>
<default_value></default_value>
<values match="last">
<value compset="DOCN%AQP">$COMP_ROOT_DIR_ATM/cime_config/usermods_dirs/aquap</value>
<value compset="DOCN%SOMAQP">$COMP_ROOT_DIR_ATM/cime_config/usermods_dirs/aquap</value>
<!-- <value compset="CAM[456]0%SCAM" >$COMP_ROOT_DIR_ATM/cime_config/usermods_dirs/scam_mandatory</value> -->
<value compset="DOCN%AQP">$COMP_ROOT_DIR_ATM/cime_config/usermods_dirs/aquap</value>
<value compset="DOCN%SOMAQP">$COMP_ROOT_DIR_ATM/cime_config/usermods_dirs/aquap</value>
</values>
<group>run_component_cam</group>
<file>env_case.xml</file>
Expand Down
Loading