Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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
14 changes: 12 additions & 2 deletions datm/cime_config/config_component.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

<entry id="DATM_PRESNDEP">
<type>char</type>
<valid_values>none,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
<valid_values>none,clim_1850_cesm3_for_cmip7,clim_1850_cmip7,clim_2000_cmip7,clim_2010_cmip7,hist_cmip7,clim_1850_cmip6,clim_2000_cmip6,clim_2010_cmip6,hist_cmip6,SSP1-2.6,SSP2-4.5,SSP3-7.0,SSP5-3.4,SSP5-8.5,cplhist</valid_values>
<default_value>clim_2000</default_value>
<values match="last">
<value compset="^1850[CE]?_" >clim_1850_cmip6</value>
Expand Down Expand Up @@ -174,6 +174,7 @@
<value compset="^SSP460_">SSP4-6.0</value>
<value compset="^SSP534_">SSP5-3.4</value>
<value compset="^SSP585_">SSP5-8.5</value>
<value compset="^1850.*_DATM%CPLHIST_CLM60">cmip7_20tr</value>
<value compset="^HIST[CE]?_">cmip6_20tr</value>
<value compset="^20TR" >cmip6_20tr</value>
<value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">omip.iaf</value>
Expand Down Expand Up @@ -204,7 +205,10 @@
<entry id="DATM_CPLHIST_DIR">
<type>char</type>
<valid_values></valid_values>
<default_value>UNSET</default_value>
<default_value>$CIME_OUTPUT_ROOT/archive/$DATM_CPLHIST_CASE/cpl/hist</default_value>
<values match="last">
<value compset="1850.*_DATM%CPLHIST_CLM60">$DIN_LOC_ROOT/cplhist/cesm3_0/$DATM_CPLHIST_CASE/atm</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>directory for coupler history data mode (only used for when DATM_MODE is CPLHIST)</desc>
Expand All @@ -214,6 +218,9 @@
<type>char</type>
<valid_values></valid_values>
<default_value>UNSET</default_value>
<values match="last">
<value compset="1850.*_DATM%CPLHIST_CLM60">CAM7CLM6_cesm30alpha08c_ne30pg3_1850</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>case name used to determine stream filenames when DATM_MODE is CPLHIST</desc>
Expand All @@ -229,6 +236,7 @@
<value compset="1850.*_DATM%CRUJRA2024[b]*">1</value>
<value compset="1850.*_DATM%CRUv7">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="1850.*_DATM%CPLHIST_CLM60">1</value>
<value compset="HIST.*_DATM%QIA">1895</value>
<value compset="HIST.*_DATM%CRUJRA2024[b]*">1901</value>
<value compset="HIST.*_DATM%CRUv7">1901</value>
Expand Down Expand Up @@ -278,6 +286,7 @@
<value compset="1850.*_DATM%CRUv7">1901</value>
<value compset="1850.*_DATM%GSW">1901</value>
<value compset="1850.*_DATM%NLDAS2">0</value> <!-- Unsupported -->
<value compset="1850.*_DATM%CPLHIST_CLM60">1</value>
<value compset="2000.*_DATM%WISOQIA">2000</value>
<value compset="2000.*_DATM%QIA">1972</value>
<value compset="HIST.*_DATM%QIA">1948</value>
Expand Down Expand Up @@ -340,6 +349,7 @@
<value compset="1850.*_DATM%CRUv7">1920</value>
<value compset="1850.*_DATM%GSW">1920</value>
<value compset="1850.*_DATM%NLDAS2">-1</value> <!-- Unsupported -->
<value compset="1850.*_DATM%CPLHIST_CLM60">3</value>
<value compset="2000.*_DATM%WISOQIA">2004</value>
<value compset="2000.*_DATM%QIA">2004</value>
<value compset="HIST.*_DATM%QIA">1972</value>
Expand Down
42 changes: 41 additions & 1 deletion datm/cime_config/stream_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4923,6 +4923,46 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="presndep.clim_1850_cesm3_for_cmip7">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file>$DIN_LOC_ROOT/atm/cam/chem/trop_strat_mam5_ts4_aero_spinup/ndep/fndep_clm_B1850C_MT4s.1850monthly.ne30_c251220.nc</file>
</stream_datafiles>
<stream_datavars>
<!-- the following stream fields are in units of g/m2/sec - need conversion to kg/m2/sec-->
<var>NDEP_NHx_month Faxa_ndep_nhx</var>
<var>NDEP_NOy_month Faxa_ndep_noy</var>
<!-- Alturnative form to use:
the following stream fields are in units of kg/m2/sec - so need no unit conversion
<var>dry_deposition_NHx_as_N Faxa_ndep_nhx_dry</var>
<var>wet_deposition_NHx_as_N Faxa_ndep_nhx_wet</var>
<var>dry_deposition_NOy_as_N Faxa_ndep_noy_dry</var>
<var>wet_deposition_NOy_as_N Faxa_ndep_noy_wet</var>
-->
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>1</stream_year_align>
<stream_year_first>1850</stream_year_first>
<stream_year_last>1850</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="presndep.clim_1850_cmip6">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
Expand Down Expand Up @@ -5270,7 +5310,7 @@
<meshfile>$ATM_DOMAIN_MESH</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.ha2x1d.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END" filename_advance_days='1'>$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.24h.avrg.%ymd-00000.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x1d_Faxa_ndep Faxa_ndep</var>
Expand Down
Loading