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.

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

cam6_4_047: update config component to handle new compset names #1078

Merged
merged 8 commits into from
Nov 19, 2024
Merged

cam6_4_047: update config component to handle new compset names #1078

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04bcd98
update config component to handle new compset names
jedwards4b Jul 5, 2024
a955e13
remove the mct submodule stub
jedwards4b Nov 14, 2024
5fef0ae
Initial changes for 1850 climate chemistry compsets
fvitt Nov 15, 2024
02df169
remove the ndep settings
fvitt Nov 18, 2024
c1a670e
Merge remote-tracking branch 'jedwards4b/remove_mct_submodule' into u…
Nov 18, 2024
4622f7d
bring in use_cases from francis; remove mct
Nov 18, 2024
2e172ee
remove gases from fincl lists that are no longer available
peverwhee Nov 19, 2024
b9b727f
add changelog
peverwhee Nov 19, 2024
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
1 change: 0 additions & 1 deletion bld/namelist_files/mozart_master_gas_drydep_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
ISOPNOOHB
ISOPNOOHD
ISOPOH
ISOPNO3
peverwhee marked this conversation as resolved.
Show resolved Hide resolved
ISOPOOH
LIMON
MACR
Expand Down
2 changes: 0 additions & 2 deletions bld/namelist_files/mozart_master_gas_wetdep_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
HOCL
HYAC
HYDRALD
ISOPNO3
ISOPOOH
MACR
MACRN
Expand Down Expand Up @@ -172,7 +171,6 @@
XHO2NO2
XONIT
XONITR
XISOPNO3
</list>

</gas_wetdep_list_definition>
48 changes: 48 additions & 0 deletions bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0"?>

<namelist_defaults>

<!-- Initial conditions -->
<ncdata hgrid="ne30np4" nlev="93">atm/cam/inic/se/1850C_T4S_ne30pg3_spinup01.cam.i.0002-01-01_c241114.nc</ncdata>

<!-- Solar data -->
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
<solar_data_type>FIXED</solar_data_type>
<solar_data_ymd>18500701</solar_data_ymd>

<!-- Ocean Emissions -->
<csw_time_type>CYCLICAL</csw_time_type>
<csw_cycle_yr>1850</csw_cycle_yr>

<!-- External forcing -->
<ext_frc_type>CYCLICAL</ext_frc_type>
<ext_frc_cycle_yr>1850</ext_frc_cycle_yr>
<ext_frc_specifier hgrid="ne30np4" npg="3">
'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a1_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
'num_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a2_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
'so4_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc'
</ext_frc_specifier>

<!-- Surface emissions -->
<srf_emis_type>CYCLICAL</srf_emis_type>
<srf_emis_cycle_yr>1850</srf_emis_cycle_yr>

<!-- Lower boundary concentrations -->
<flbc_type>CYCLICAL</flbc_type>
<flbc_cycle_yr>1850</flbc_cycle_yr>
<flbc_file>atm/waccm/lb/LBC_17500116-25001216_CMIP6_SSP585_0p5degLat_c20200824.nc</flbc_file>
<flbc_list>
'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'H2402', 'OCS', 'SF6', 'CFC11eq'
</flbc_list>

<!-- history output -->
<history_chemistry>.true.</history_chemistry>
<history_chemspecies_srf>.false.</history_chemspecies_srf>
<history_clubb>.false.</history_clubb>

</namelist_defaults>
4 changes: 2 additions & 2 deletions bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,15 @@
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
'WD_XOOH', 'WD_XYLENOOH', 'WD_XYLOLOOH', 'DF_ALKNIT', 'DF_ALKOOH', 'DF_BENZOOH', 'DF_BZOOH', 'DF_C2H5OH', 'DF_C2H5OOH',
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',
Expand Down
4 changes: 2 additions & 2 deletions bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,15 +381,15 @@
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
'WD_XOOH', 'WD_XYLENOOH', 'WD_XYLOLOOH', 'DF_ALKNIT', 'DF_ALKOOH', 'DF_BENZOOH', 'DF_BZOOH', 'DF_C2H5OH', 'DF_C2H5OOH',
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',
Expand Down
0 ...es/use_cases/hist_trop_strat_ts4_cam7.xml → ...es/use_cases/hist_trop_strat_t4s_cam7.xml
View file
Open in desktop
File renamed without changes.
23 changes: 12 additions & 11 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,14 @@
<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="1850_CAM70%LT" >1850_cam_lt</value>
<value compset="1850_CAM70%MT" >1850_cam_mt</value>
<value compset="1850[CE]?_CAM70%LT" >1850_cam_lt</value>
<value compset="1850[CE]?_CAM70%MT" >1850_cam_mt</value>

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

<value compset="2000_CAM70" >2000_cam6</value>
<value compset="2000[CE]?_CAM70" >2000_cam6</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>
Expand Down Expand Up @@ -279,7 +279,8 @@
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
<value compset="HIST(C_|E_|_)CAM.*CT1S">hist_trop_strat_vbs_cam6</value>
<value compset="HISTC_CAM7.*CT4S" >hist_trop_strat_ts4_cam7</value>
<value compset="HIST[CE]?_CAM7.*CT4S" >hist_trop_strat_t4s_cam7</value>
<value compset="1850[CE]?_CAM7.*CT4S" >1850_trop_strat_t4s_cam7</value>
<value compset="HIST_CAM60%.*CT[12]S%NUDG">hist_trop_strat_nudged_cam6</value>
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
Expand Down Expand Up @@ -392,9 +393,9 @@
<type>char</type>
<default_value>2000</default_value>
<values match="last">
<value compset="^1850_">1850</value>
<value compset="^1850[CE]?_">1850</value>
peverwhee marked this conversation as resolved.
Show resolved Hide resolved
<value compset="^2010_">2010</value>
<value compset="^HIST_">1850</value>
<value compset="^HIST[CE]?_">1850</value>
<value compset="^SSP" >2015</value>
</values>
<group>run_component_cam</group>
Expand All @@ -407,8 +408,8 @@
<default_value>2000</default_value>
<values match="last">
<value compset="^2010_">2010</value>
<value compset="^1850_">1850</value>
<value compset="^HIST_">2015</value>
<value compset="^1850[CE]?_">1850</value>
<value compset="^HIST[CE]?_">2015</value>
<value compset="^SSP" >2101</value>
</values>
<group>run_component_cam</group>
Expand All @@ -420,7 +421,7 @@
<type>char</type>
<default_value>1</default_value>
<values match="last">
<value compset="^HIST_">1850</value>
<value compset="^HIST[CE]?_">1850</value>
<value compset="^SSP" >2015</value>
</values>
<group>run_component_cam</group>
Expand All @@ -437,10 +438,10 @@
<value compset="^SSP126_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</value>
<value compset="^SSP245_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</value>
<value compset="^SSP370_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc</value>
<value compset="^HIST" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^HIST[CE]?_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^2000_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^2010_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</value>
<value compset="^1850_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
<value compset="^1850[CE]?_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
</values>
<group>run_component_cam</group>
<file>env_run.xml</file>
Expand Down
1 change: 0 additions & 1 deletion libraries/mct
Open in desktop
Submodule mct deleted from 82b007
2 changes: 1 addition & 1 deletion src/cpl/nuopc/atm_stream_ndep.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ subroutine stream_ndep_init(model_mesh, model_clock, rc)
if (ierr /= 0) call endrun(trim(subname)//": FATAL: mpi_bcast: stream_ndep_year_align")

! Check whether the stream is being used.
if (stream_ndep_data_filename == ' ') then
if (stream_ndep_data_filename == ' '.or.stream_ndep_data_filename == 'UNSET') then
use_ndep_stream = .false.
if (masterproc) then
write(iulog,'(a)') ' '
Expand Down