Skip to content

Fix align year #92

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

Merged
jedwards4b merged 7 commits into from
May 14, 2021
Merged

Fix align year #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c15126b
Hardcode the align year to prevent the problem in #89, this isn't the…
ekluzek May 13, 2021
392f903
Set DATM_YR_ settings for 1PT based on the grid, and use it in the st…
ekluzek May 13, 2021
a085432
Change grid name in test list to fix #91
ekluzek May 13, 2021
ccd6756
Fix grid mask and add new testmods for 1PT to set start date
ekluzek May 13, 2021
db51eaa
Go one day in so don't have to set the START_TOD as well as the date
ekluzek May 13, 2021
0cb466f
Correct name of XML variable
ekluzek May 13, 2021
b267f29
Merge branch 'master' into fixalignyear
jedwards4b May 14, 2021
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
11 changes: 9 additions & 2 deletions datm/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
<valid_values></valid_values>
<default_value>1</default_value>
<values match="last">
<value compset="2000.*_DATM%1PT">$DATM_YR_START</value>
<value compset="1850.*_DATM%QIA">1</value>
<value compset="1850.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
Expand Down Expand Up @@ -206,7 +207,10 @@
<valid_values></valid_values>
<default_value>2004</default_value>
<values match="last">
<value compset="2000.*_DATM%1PT">2018</value>
<value compset="2000.*_DATM%1PT" grid="CLM_USRDAT" >2018</value>
<value compset="2000.*_DATM%1PT" grid="1x1_mexicocityMEX">1993</value>
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >1</value>
<value compset="1850.*_DATM%QIA">1948</value>
<value compset="1850.*_DATM%CRU">1901</value>
<value compset="1850.*_DATM%GSW">1901</value>
Expand Down Expand Up @@ -248,7 +252,10 @@
<valid_values></valid_values>
<default_value>2004</default_value>
<values match="last">
<value compset="2000.*_DATM%1PT">2019</value>
<value compset="2000.*_DATM%1PT" grid="CLM_USRDAT" >2019</value>
<value compset="2000.*_DATM%1PT" grid="1x1_mexicocityMEX">1993</value>
<value compset="2000.*_DATM%1PT" grid="1x1_vancouverCAN" >1992</value>
<value compset="2000.*_DATM%1PT" grid="1x1_urbanc_alpha" >2</value>
<value compset="1850.*_DATM%QIA">1972</value>
<value compset="1850.*_DATM%CRU">1920</value>
<value compset="1850.*_DATM%GSW">1920</value>
Expand Down
18 changes: 9 additions & 9 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 @@ -557,7 +557,7 @@
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_align>2000</stream_year_align>
<stream_year_first>2000</stream_year_first>
<stream_year_last>2004</stream_year_last>
<stream_offset>0</stream_offset>
Expand Down Expand Up @@ -588,7 +588,7 @@
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_align>2000</stream_year_align>
<stream_year_first>2000</stream_year_first>
<stream_year_last>2004</stream_year_last>
<stream_offset>0</stream_offset>
Expand Down Expand Up @@ -622,7 +622,7 @@
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_align>2000</stream_year_align>
<stream_year_first>2000</stream_year_first>
<stream_year_last>2004</stream_year_last>
<stream_offset>0</stream_offset>
Expand Down Expand Up @@ -812,8 +812,8 @@
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>1993</stream_year_first>
<stream_year_last >1993</stream_year_last>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last >$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>nearest</tintalgo>
Expand Down Expand Up @@ -852,8 +852,8 @@
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>1992</stream_year_first>
<stream_year_last >1992</stream_year_last>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last >$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>nearest</tintalgo>
Expand Down Expand Up @@ -907,8 +907,8 @@
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>0001</stream_year_first>
<stream_year_last >0002</stream_year_last>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last >$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>nearest</tintalgo>
Expand Down
16 changes: 8 additions & 8 deletions datm/cime_config/testdefs/testlist_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,55 @@
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
</test>
<test compset="2000_DATM%QIA_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%QIA_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_DATM%CRUv7_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%CRUv7_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="HIST_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="HIST_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="1850_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="1850_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="SSP585_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="SSP585_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
Expand Down Expand Up @@ -94,7 +94,7 @@
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_DATM%1PT_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="1x1_mexicocityMEX" name="SMS_Vnuopc_Ld5_P1">
<test compset="2000_DATM%1PT_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="1x1_mexicocityMEX" name="SMS_Vnuopc_Ld5_P1" testmods="datm/1PT">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
Expand Down
12 changes: 12 additions & 0 deletions datm/cime_config/testdefs/testmods_dirs/datm/1PT/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
if [ "`./xmlquery ATM_GRID --value`" == "1x1_vancouverCAN" ]; then
# Go one day in, so don't have to set the TOD as well
./xmlchange RUN_STARTDATE="1992-08-13"
elif [ "`./xmlquery ATM_GRID --value`" == "1x1_mexicocityMEX" ]; then
# Go one day in, so don't have to set the TOD as well
./xmlchange RUN_STARTDATE="1993-12-02"
elif [ "`./xmlquery ATM_GRID --value`" == "1x1_urbanc_alpha" ]; then
# Go one day in, so don't have to set the TOD as well
./xmlchange RUN_STARTDATE="0001-08-13"
else
./xmlchange RUN_STARTDATE="2018-01-01"
fi