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

Jump to bottom

Update stream definitions for new coupler history file format #228

Merged
merged 4 commits into from
May 9, 2023
Merged

Update stream definitions for new coupler history file format #228

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27e1c3e
Update stream definitions for new coupler history file format.
olyson Apr 28, 2023
8136439
Merge tag 'cdeps1.0.10' into cplhistStreams
olyson Apr 28, 2023
d47f1ba
filename_add_days to filename_advance_days
olyson Apr 28, 2023
252acc0
Merge remote-tracking branch 'escomp/main' into cplhistStreams
billsacks May 9, 2023
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
84 changes: 42 additions & 42 deletions datm/cime_config/stream_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4619,10 +4619,10 @@
<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.ha2x3h.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.3h.avrg.%ymd-10800.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x3h_Sa_topo Sa_topo</var>
<var>atmImp_Sa_topo Sa_topo</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand All @@ -4649,23 +4649,23 @@
<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_bcphiwet Faxa_bcphiwet</var>
<var>a2x1d_Faxa_bcphodry Faxa_bcphodry</var>
<var>a2x1d_Faxa_bcphidry Faxa_bcphidry</var>
<var>a2x1d_Faxa_ocphiwet Faxa_ocphiwet</var>
<var>a2x1d_Faxa_ocphidry Faxa_ocphidry</var>
<var>a2x1d_Faxa_ocphodry Faxa_ocphodry</var>
<var>a2x1d_Faxa_dstwet1 Faxa_dstwet1</var>
<var>a2x1d_Faxa_dstdry1 Faxa_dstdry1</var>
<var>a2x1d_Faxa_dstwet2 Faxa_dstwet2</var>
<var>a2x1d_Faxa_dstdry2 Faxa_dstdry2</var>
<var>a2x1d_Faxa_dstwet3 Faxa_dstwet3</var>
<var>a2x1d_Faxa_dstdry3 Faxa_dstdry3</var>
<var>a2x1d_Faxa_dstwet4 Faxa_dstwet4</var>
<var>a2x1d_Faxa_dstdry4 Faxa_dstdry4</var>
<var>atmImp_Faxa_bcph1 Faxa_bcphidry</var>
<var>atmImp_Faxa_bcph2 Faxa_bcphodry</var>
<var>atmImp_Faxa_bcph3 Faxa_bcphiwet</var>
<var>atmImp_Faxa_ocph1 Faxa_ocphidry</var>
<var>atmImp_Faxa_ocph2 Faxa_ocphodry</var>
<var>atmImp_Faxa_ocph3 Faxa_ocphiwet</var>
<var>atmImp_Faxa_dstwet1 Faxa_dstwet1</var>
<var>atmImp_Faxa_dstdry1 Faxa_dstdry1</var>
<var>atmImp_Faxa_dstwet2 Faxa_dstwet2</var>
<var>atmImp_Faxa_dstdry2 Faxa_dstdry2</var>
<var>atmImp_Faxa_dstwet3 Faxa_dstwet3</var>
<var>atmImp_Faxa_dstdry3 Faxa_dstdry3</var>
<var>atmImp_Faxa_dstwet4 Faxa_dstwet4</var>
<var>atmImp_Faxa_dstdry4 Faxa_dstdry4</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand Down Expand Up @@ -4724,13 +4724,13 @@
<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.ha2x1hi.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.1h.inst.%ymd-03600.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x1hi_Faxa_swndr Faxa_swndr</var>
<var>a2x1hi_Faxa_swvdr Faxa_swvdr</var>
<var>a2x1hi_Faxa_swndf Faxa_swndf</var>
<var>a2x1hi_Faxa_swvdf Faxa_swvdf</var>
<var>atmImp_Faxa_swndr Faxa_swndr</var>
<var>atmImp_Faxa_swvdr Faxa_swvdr</var>
<var>atmImp_Faxa_swndf Faxa_swndf</var>
<var>atmImp_Faxa_swvdf Faxa_swvdf</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand All @@ -4740,7 +4740,7 @@
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>2700</stream_offset>
<stream_offset>-900</stream_offset>
<stream_tintalgo>
<tintalgo>nearest</tintalgo>
</stream_tintalgo>
Expand All @@ -4758,14 +4758,14 @@
<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.ha2x3h.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.3h.avrg.%ymd-10800.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x3h_Faxa_rainc Faxa_rainc</var>
<var>a2x3h_Faxa_rainl Faxa_rainl</var>
<var>a2x3h_Faxa_snowc Faxa_snowc</var>
<var>a2x3h_Faxa_snowl Faxa_snowl</var>
<var>a2x3h_Faxa_lwdn Faxa_lwdn</var>
<var>atmImp_Faxa_rainc Faxa_rainc</var>
<var>atmImp_Faxa_rainl Faxa_rainl</var>
<var>atmImp_Faxa_snowc Faxa_snowc</var>
<var>atmImp_Faxa_snowl Faxa_snowl</var>
<var>atmImp_Faxa_lwdn Faxa_lwdn</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand Down Expand Up @@ -4793,18 +4793,18 @@
<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.ha2x3h.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.3h.avrg.%ymd-10800.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x3h_Sa_z Sa_z</var>
<var>a2x3h_Sa_tbot Sa_tbot</var>
<var>a2x3h_Sa_ptem Sa_ptem</var>
<var>a2x3h_Sa_shum Sa_shum</var>
<var>a2x3h_Sa_pbot Sa_pbot</var>
<var>a2x3h_Sa_dens Sa_dens</var>
<var>a2x3h_Sa_pslv Sa_pslv</var>
<var>a2x3h_Sa_co2diag Sa_co2diag</var>
<var>a2x3h_Sa_co2prog Sa_co2prog</var>
<var>atmImp_Sa_z Sa_z</var>
<var>atmImp_Sa_tbot Sa_tbot</var>
<var>atmImp_Sa_ptem Sa_ptem</var>
<var>atmImp_Sa_shum Sa_shum</var>
<var>atmImp_Sa_pbot Sa_pbot</var>
<var>atmImp_Sa_dens Sa_dens</var>
<var>atmImp_Sa_pslv Sa_pslv</var>
<var>atmImp_Sa_co2diag Sa_co2diag</var>
<var>atmImp_Sa_co2prog Sa_co2prog</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand Down Expand Up @@ -4832,11 +4832,11 @@
<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.ha2x1h.%ym.nc</file>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DATM_CPLHIST_DIR/$DATM_CPLHIST_CASE.cpl.hx.atm.1h.avrg.%ymd-03600.nc</file>
</stream_datafiles>
<stream_datavars>
<var>a2x1h_Sa_u Sa_u</var>
<var>a2x1h_Sa_v Sa_v</var>
<var>atmImp_Sa_u Sa_u</var>
<var>atmImp_Sa_v Sa_v</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
Expand Down