Skip to content

Commit 99dbe11

Browse files
peverwheepeverwhee
committed
merge to head of cam_development
2 parents a9441a8 + f429ebf commit 99dbe11

14 files changed

+379
-79
lines changed

‎.gitmodules‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,28 +151,28 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
151151
[submodule "cime"]
152152
path = cime
153153
url = https://github.com/ESMCI/cime
154-
fxtag = cime6.1.41
154+
fxtag = cime6.1.49
155155
fxrequired = ToplevelRequired
156156
fxDONOTUSEurl = https://github.com/ESMCI/cime
157157

158158
[submodule "cmeps"]
159159
path = components/cmeps
160160
url = https://github.com/ESCOMP/CMEPS.git
161-
fxtag = cmeps1.0.22
161+
fxtag = cmeps1.0.32
162162
fxrequired = ToplevelRequired
163163
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
164164

165165
[submodule "cdeps"]
166166
path = components/cdeps
167167
url = https://github.com/ESCOMP/CDEPS.git
168-
fxtag = cdeps1.0.53
168+
fxtag = cdeps1.0.61
169169
fxrequired = ToplevelRequired
170170
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
171171

172172
[submodule "share"]
173173
path = share
174174
url = https://github.com/ESCOMP/CESM_share
175-
fxtag = share1.1.2
175+
fxtag = share1.1.6
176176
fxrequired = ToplevelRequired
177177
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
178178

@@ -193,7 +193,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
193193
[submodule "clm"]
194194
path = components/clm
195195
url = https://github.com/ESCOMP/CTSM
196-
fxtag = ctsm5.3.002
196+
fxtag = ctsm5.3.016
197197
fxrequired = ToplevelRequired
198198
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
199199

‎bld/namelist_files/mozart_master_gas_drydep_list.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
ISOPNOOHB
7878
ISOPNOOHD
7979
ISOPOH
80-
ISOPNO3
8180
ISOPOOH
8281
LIMON
8382
MACR

‎bld/namelist_files/mozart_master_gas_wetdep_list.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
HOCL
128128
HYAC
129129
HYDRALD
130-
ISOPNO3
131130
ISOPOOH
132131
MACR
133132
MACRN
@@ -172,7 +171,6 @@
172171
XHO2NO2
173172
XONIT
174173
XONITR
175-
XISOPNO3
176174
</list>
177175

178176
</gas_wetdep_list_definition>

‎bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<!-- Initial conditions -->
6+
<ncdata hgrid="ne30np4" nlev="93">atm/cam/inic/se/1850C_T4S_ne30pg3_spinup01.cam.i.0002-01-01_c241114.nc</ncdata>
7+
8+
<!-- Solar data -->
9+
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
10+
<solar_data_type>FIXED</solar_data_type>
11+
<solar_data_ymd>18500701</solar_data_ymd>
12+
13+
<!-- Ocean Emissions -->
14+
<csw_time_type>CYCLICAL</csw_time_type>
15+
<csw_cycle_yr>1850</csw_cycle_yr>
16+
17+
<!-- External forcing -->
18+
<ext_frc_type>CYCLICAL</ext_frc_type>
19+
<ext_frc_cycle_yr>1850</ext_frc_cycle_yr>
20+
<ext_frc_specifier hgrid="ne30np4" npg="3">
21+
'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
22+
'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a1_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
23+
'num_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a2_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
24+
'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
25+
'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
26+
'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
27+
'so4_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc'
28+
</ext_frc_specifier>
29+
30+
<!-- Surface emissions -->
31+
<srf_emis_type>CYCLICAL</srf_emis_type>
32+
<srf_emis_cycle_yr>1850</srf_emis_cycle_yr>
33+
34+
<!-- Lower boundary concentrations -->
35+
<flbc_type>CYCLICAL</flbc_type>
36+
<flbc_cycle_yr>1850</flbc_cycle_yr>
37+
<flbc_file>atm/waccm/lb/LBC_17500116-25001216_CMIP6_SSP585_0p5degLat_c20200824.nc</flbc_file>
38+
<flbc_list>
39+
'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
40+
'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'H2402', 'OCS', 'SF6', 'CFC11eq'
41+
</flbc_list>
42+
43+
<!-- history output -->
44+
<history_chemistry>.true.</history_chemistry>
45+
<history_chemspecies_srf>.false.</history_chemspecies_srf>
46+
<history_clubb>.false.</history_clubb>
47+
48+
</namelist_defaults>

‎bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@
190190
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
191191
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
192192
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
193-
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
193+
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
194194
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
195195
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
196196
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
197197
'WD_XOOH', 'WD_XYLENOOH', 'WD_XYLOLOOH', 'DF_ALKNIT', 'DF_ALKOOH', 'DF_BENZOOH', 'DF_BZOOH', 'DF_C2H5OH', 'DF_C2H5OOH',
198198
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
199199
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
200200
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
201-
'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
201+
'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
202202
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
203203
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
204204
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',

‎bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,15 +381,15 @@
381381
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
382382
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
383383
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
384-
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
384+
'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
385385
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
386386
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
387387
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
388388
'WD_XOOH', 'WD_XYLENOOH', 'WD_XYLOLOOH', 'DF_ALKNIT', 'DF_ALKOOH', 'DF_BENZOOH', 'DF_BZOOH', 'DF_C2H5OH', 'DF_C2H5OOH',
389389
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
390390
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
391391
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
392-
'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
392+
'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
393393
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
394394
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
395395
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',

‎bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml‎ renamed to ‎bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml‎

File renamed without changes.

‎cime_config/config_component.xml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@
232232
<value compset="1850_CAM60%WCTS" >waccm_tsmlt_1850_cam6</value>
233233
<value compset="1850_CAM60%WCCM" >waccm_ma_1850_cam6</value>
234234
<value compset="1850_CAM60%WCSC" >waccm_sc_1850_cam6</value>
235-
<value compset="1850_CAM70%LT" >1850_cam_lt</value>
236-
<value compset="1850_CAM70%MT" >1850_cam_mt</value>
235+
<value compset="1850[CE]?_CAM70%LT" >1850_cam_lt</value>
236+
<value compset="1850[CE]?_CAM70%MT" >1850_cam_mt</value>
237237

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

242-
<value compset="2000_CAM70" >2000_cam6</value>
242+
<value compset="2000[CE]?_CAM70" >2000_cam6</value>
243243
<value compset="2000_CAM60" >2000_cam6</value>
244244
<value compset="2000_CAM60%WCTS" >waccm_tsmlt_2000_cam6</value>
245245
<value compset="2000_CAM60%WCCM" >waccm_ma_2000_cam6</value>
@@ -279,7 +279,8 @@
279279
<value compset="HIST_CAM60%WCMD" >waccm_ma_hist_cam6</value>
280280
<value compset="HIST_CAM40%WCMD" >waccm_ma_hist_cam4</value>
281281
<value compset="HIST(C_|E_|_)CAM.*CT1S">hist_trop_strat_vbs_cam6</value>
282-
<value compset="HISTC_CAM7.*CT4S" >hist_trop_strat_ts4_cam7</value>
282+
<value compset="HIST[CE]?_CAM7.*CT4S" >hist_trop_strat_t4s_cam7</value>
283+
<value compset="1850[CE]?_CAM7.*CT4S" >1850_trop_strat_t4s_cam7</value>
283284
<value compset="HIST_CAM60%.*CT[12]S%NUDG">hist_trop_strat_nudged_cam6</value>
284285
<value compset="HIST_CAM60%CVBSX" >hist_trop_strat_vbsext_cam6</value>
285286
<value compset="HIST_CAM60%CFIRE" >hist_trop_strat_vbsfire_cam6</value>
@@ -392,9 +393,9 @@
392393
<type>char</type>
393394
<default_value>2000</default_value>
394395
<values match="last">
395-
<value compset="^1850_">1850</value>
396+
<value compset="^1850[CE]?_">1850</value>
396397
<value compset="^2010_">2010</value>
397-
<value compset="^HIST_">1850</value>
398+
<value compset="^HIST[CE]?_">1850</value>
398399
<value compset="^SSP" >2015</value>
399400
</values>
400401
<group>run_component_cam</group>
@@ -407,8 +408,8 @@
407408
<default_value>2000</default_value>
408409
<values match="last">
409410
<value compset="^2010_">2010</value>
410-
<value compset="^1850_">1850</value>
411-
<value compset="^HIST_">2015</value>
411+
<value compset="^1850[CE]?_">1850</value>
412+
<value compset="^HIST[CE]?_">2015</value>
412413
<value compset="^SSP" >2101</value>
413414
</values>
414415
<group>run_component_cam</group>
@@ -420,7 +421,7 @@
420421
<type>char</type>
421422
<default_value>1</default_value>
422423
<values match="last">
423-
<value compset="^HIST_">1850</value>
424+
<value compset="^HIST[CE]?_">1850</value>
424425
<value compset="^SSP" >2015</value>
425426
</values>
426427
<group>run_component_cam</group>
@@ -437,10 +438,10 @@
437438
<value compset="^SSP126_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</value>
438439
<value compset="^SSP245_">$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</value>
439440
<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>
440-
<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>
441+
<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>
441442
<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>
442443
<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>
443-
<value compset="^1850_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
444+
<value compset="^1850[CE]?_" >$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</value>
444445
</values>
445446
<group>run_component_cam</group>
446447
<file>env_run.xml</file>

0 commit comments

Comments
 (0)