Skip to content

Commit

Permalink
bring in use_cases from francis; remove mct
Browse files Browse the repository at this point in the history
  • Loading branch information
Courtney Peverley committed Nov 18, 2024
2 parents c1a670e + 02df169 commit 4622f7d
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 5 deletions.
1 change: 0 additions & 1 deletion bld/namelist_files/mozart_master_gas_drydep_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
ISOPNOOHB
ISOPNOOHD
ISOPOH
ISOPNO3
ISOPOOH
LIMON
MACR
Expand Down
2 changes: 0 additions & 2 deletions bld/namelist_files/mozart_master_gas_wetdep_list.xml
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
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>
3 changes: 2 additions & 1 deletion cime_config/config_component.xml
Original file line number Diff line number Diff line change
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="HIST[CE]?_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
2 changes: 1 addition & 1 deletion src/cpl/nuopc/atm_stream_ndep.F90
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

0 comments on commit 4622f7d

Please sign in to comment.