Skip to content

Commit 7abdb49

Browse files
trhilletrhille
committed
Use Jan 1 start and end dates instead of Jan 15
Use Jan 1 start and end dates instead of Jan 15. This is in line with interpreting the Jan 15 time-stamp in ISMIP7 forcing files as representing Jan 1 to 31, rather than Jan 15 to Feb 14.
1 parent 629c2d0 commit 7abdb49

8 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎compass/landice/tests/ismip7_run/ismip7_ais/__init__.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,58 +12,58 @@
1212
EXPERIMENTS = {
1313
'historical_CESM2-WACCM': {
1414
'scenario': 'historical', 'model': 'CESM2-WACCM',
15-
'start_time': '2000-01-15_00:00:00',
16-
'stop_time': '2015-01-15_00:00:00',
15+
'start_time': '2000-01-01_00:00:00',
16+
'stop_time': '2015-01-01_00:00:00',
1717
'is_historical': True},
1818
'historical_MRI-ESM2-0': {
1919
'scenario': 'historical', 'model': 'MRI-ESM2-0',
20-
'start_time': '2000-01-15_00:00:00',
21-
'stop_time': '2015-01-15_00:00:00',
20+
'start_time': '2000-01-01_00:00:00',
21+
'stop_time': '2015-01-01_00:00:00',
2222
'is_historical': True},
2323
'ssp370_CESM2-WACCM': {
2424
'scenario': 'ssp370', 'model': 'CESM2-WACCM',
25-
'start_time': '2015-01-15_00:00:00',
26-
'stop_time': '2101-01-15_00:00:00',
25+
'start_time': '2015-01-01_00:00:00',
26+
'stop_time': '2101-01-01_00:00:00',
2727
'is_historical': False},
2828
'ssp370_MRI-ESM2-0': {
2929
'scenario': 'ssp370', 'model': 'MRI-ESM2-0',
30-
'start_time': '2015-01-15_00:00:00',
31-
'stop_time': '2101-01-15_00:00:00',
30+
'start_time': '2015-01-01_00:00:00',
31+
'stop_time': '2101-01-01_00:00:00',
3232
'is_historical': False},
3333
'ssp126_CESM2-WACCM': {
3434
'scenario': 'ssp126', 'model': 'CESM2-WACCM',
35-
'start_time': '2015-01-15_00:00:00',
36-
'stop_time': '2301-01-15_00:00:00',
35+
'start_time': '2015-01-01_00:00:00',
36+
'stop_time': '2301-01-01_00:00:00',
3737
'is_historical': False},
3838
'ssp126_MRI-ESM2-0': {
3939
'scenario': 'ssp126', 'model': 'MRI-ESM2-0',
40-
'start_time': '2015-01-15_00:00:00',
41-
'stop_time': '2301-01-15_00:00:00',
40+
'start_time': '2015-01-01_00:00:00',
41+
'stop_time': '2301-01-01_00:00:00',
4242
'is_historical': False},
4343
'ssp585_CESM2-WACCM': {
4444
'scenario': 'ssp585', 'model': 'CESM2-WACCM',
45-
'start_time': '2015-01-15_00:00:00',
46-
'stop_time': '2301-01-15_00:00:00',
45+
'start_time': '2015-01-01_00:00:00',
46+
'stop_time': '2301-01-01_00:00:00',
4747
'is_historical': False},
4848
'ssp585_MRI-ESM2-0': {
4949
'scenario': 'ssp585', 'model': 'MRI-ESM2-0',
50-
'start_time': '2015-01-15_00:00:00',
51-
'stop_time': '2301-01-15_00:00:00',
50+
'start_time': '2015-01-01_00:00:00',
51+
'stop_time': '2301-01-01_00:00:00',
5252
'is_historical': False},
5353
'ctrl_CESM2-WACCM': {
5454
'scenario': 'ctrl', 'model': 'CESM2-WACCM',
55-
'start_time': '2015-01-15_00:00:00',
56-
'stop_time': '2301-01-15_00:00:00',
55+
'start_time': '2015-01-01_00:00:00',
56+
'stop_time': '2301-01-01_00:00:00',
5757
'is_historical': False},
5858
'ctrl_MRI-ESM2-0': {
5959
'scenario': 'ctrl', 'model': 'MRI-ESM2-0',
60-
'start_time': '2015-01-15_00:00:00',
61-
'stop_time': '2301-01-15_00:00:00',
60+
'start_time': '2015-01-01_00:00:00',
61+
'stop_time': '2301-01-01_00:00:00',
6262
'is_historical': False},
6363
'ocx': {
6464
'scenario': 'ocx', 'model': None,
65-
'start_time': '1990-01-15_00:00:00',
66-
'stop_time': '2026-01-15_00:00:00',
65+
'start_time': '1990-01-01_00:00:00',
66+
'stop_time': '2026-01-01_00:00:00',
6767
'is_historical': True},
6868
}
6969

‎compass/landice/tests/ismip7_run/ismip7_ais/namelist.landice‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
config_do_restart = .true.
6161
config_restart_timestamp_name = 'restart_timestamp'
6262
config_start_time = 'file'
63-
config_stop_time = '2301-01-15_00:00:00'
63+
config_stop_time = '2301-01-01_00:00:00'
6464
config_calendar_type = 'noleap'
6565

6666
config_stats_interval = 0

‎compass/landice/tests/ismip7_run/ismip7_ais/set_up_experiment.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,11 @@ def setup(self): # noqa: C901
344344
# --- Symlink restart for projections/ctrl ---
345345
if not is_historical:
346346
hist_exp = f"historical_{model}"
347-
os.symlink(f"../{hist_exp}/rst.2015-01-15.nc",
348-
os.path.join(self.work_dir, 'rst.2015-01-15.nc'))
347+
os.symlink(f"../{hist_exp}/rst.2015-01-01.nc",
348+
os.path.join(self.work_dir, 'rst.2015-01-01.nc'))
349349
with open(os.path.join(self.work_dir, "restart_timestamp"),
350350
"w") as text_file:
351-
text_file.write("2015-01-15_00:00:00")
351+
text_file.write("2015-01-01_00:00:00")
352352

353353
# --- Add albany yaml, graph file, load script, job script ---
354354
self.add_input_file(

‎compass/landice/tests/ismip7_run/ismip7_ais/streams.landice.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
type="input"
3232
filename_template="{{ input_file_SMB_forcing }}"
3333
input_interval="{{ forcing_interval_monthly }}"
34-
reference_time="2000-01-15_00:00:00"
34+
reference_time="2000-01-01_00:00:00"
3535
runtime_format="single_file">
3636
<var name="sfcMassBal"/>
3737
</stream>
@@ -40,7 +40,7 @@
4040
type="input"
4141
filename_template="{{ input_file_temperature_forcing }}"
4242
input_interval="{{ forcing_interval_monthly }}"
43-
reference_time="2000-01-15_00:00:00"
43+
reference_time="2000-01-01_00:00:00"
4444
runtime_format="single_file">
4545
<var name="surfaceAirTemperature"/>
4646
</stream>
@@ -59,7 +59,7 @@
5959
type="input"
6060
filename_template="{{ input_file_runoff_forcing }}"
6161
input_interval="{{ forcing_interval_monthly }}"
62-
reference_time="2000-01-15_00:00:00"
62+
reference_time="2000-01-01_00:00:00"
6363
runtime_format="single_file">
6464
<var name="ismip6Runoff"/>
6565
</stream>

‎compass/landice/tests/ismip7_run/ismip7_gris/__init__.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,58 +9,58 @@
99
EXPERIMENTS = {
1010
'historical_CESM2-WACCM': {
1111
'scenario': 'historical', 'model': 'CESM2-WACCM',
12-
'start_time': '2000-01-15_00:00:00',
13-
'stop_time': '2015-01-15_00:00:00',
12+
'start_time': '2000-01-01_00:00:00',
13+
'stop_time': '2015-01-01_00:00:00',
1414
'is_historical': True},
1515
'historical_MRI-ESM2-0': {
1616
'scenario': 'historical', 'model': 'MRI-ESM2-0',
17-
'start_time': '2000-01-15_00:00:00',
18-
'stop_time': '2015-01-15_00:00:00',
17+
'start_time': '2000-01-01_00:00:00',
18+
'stop_time': '2015-01-01_00:00:00',
1919
'is_historical': True},
2020
'ssp370_CESM2-WACCM': {
2121
'scenario': 'ssp370', 'model': 'CESM2-WACCM',
22-
'start_time': '2015-01-15_00:00:00',
23-
'stop_time': '2101-01-15_00:00:00',
22+
'start_time': '2015-01-01_00:00:00',
23+
'stop_time': '2101-01-01_00:00:00',
2424
'is_historical': False},
2525
'ssp370_MRI-ESM2-0': {
2626
'scenario': 'ssp370', 'model': 'MRI-ESM2-0',
27-
'start_time': '2015-01-15_00:00:00',
28-
'stop_time': '2101-01-15_00:00:00',
27+
'start_time': '2015-01-01_00:00:00',
28+
'stop_time': '2101-01-01_00:00:00',
2929
'is_historical': False},
3030
'ssp126_CESM2-WACCM': {
3131
'scenario': 'ssp126', 'model': 'CESM2-WACCM',
32-
'start_time': '2015-01-15_00:00:00',
33-
'stop_time': '2301-01-15_00:00:00',
32+
'start_time': '2015-01-01_00:00:00',
33+
'stop_time': '2301-01-01_00:00:00',
3434
'is_historical': False},
3535
'ssp126_MRI-ESM2-0': {
3636
'scenario': 'ssp126', 'model': 'MRI-ESM2-0',
37-
'start_time': '2015-01-15_00:00:00',
38-
'stop_time': '2301-01-15_00:00:00',
37+
'start_time': '2015-01-01_00:00:00',
38+
'stop_time': '2301-01-01_00:00:00',
3939
'is_historical': False},
4040
'ssp585_CESM2-WACCM': {
4141
'scenario': 'ssp585', 'model': 'CESM2-WACCM',
42-
'start_time': '2015-01-15_00:00:00',
43-
'stop_time': '2301-01-15_00:00:00',
42+
'start_time': '2015-01-01_00:00:00',
43+
'stop_time': '2301-01-01_00:00:00',
4444
'is_historical': False},
4545
'ssp585_MRI-ESM2-0': {
4646
'scenario': 'ssp585', 'model': 'MRI-ESM2-0',
47-
'start_time': '2015-01-15_00:00:00',
48-
'stop_time': '2301-01-15_00:00:00',
47+
'start_time': '2015-01-01_00:00:00',
48+
'stop_time': '2301-01-01_00:00:00',
4949
'is_historical': False},
5050
'ctrl_CESM2-WACCM': {
5151
'scenario': 'ctrl', 'model': 'CESM2-WACCM',
52-
'start_time': '2015-01-15_00:00:00',
53-
'stop_time': '2301-01-15_00:00:00',
52+
'start_time': '2015-01-01_00:00:00',
53+
'stop_time': '2301-01-01_00:00:00',
5454
'is_historical': False},
5555
'ctrl_MRI-ESM2-0': {
5656
'scenario': 'ctrl', 'model': 'MRI-ESM2-0',
57-
'start_time': '2015-01-15_00:00:00',
58-
'stop_time': '2301-01-15_00:00:00',
57+
'start_time': '2015-01-01_00:00:00',
58+
'stop_time': '2301-01-01_00:00:00',
5959
'is_historical': False},
6060
'ocx': {
6161
'scenario': 'ocx', 'model': None,
62-
'start_time': '1990-01-15_00:00:00',
63-
'stop_time': '2026-01-15_00:00:00',
62+
'start_time': '1990-01-01_00:00:00',
63+
'stop_time': '2026-01-01_00:00:00',
6464
'is_historical': True},
6565
}
6666

‎compass/landice/tests/ismip7_run/ismip7_gris/namelist.landice‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
config_do_restart = .true.
6464
config_restart_timestamp_name = 'restart_timestamp'
6565
config_start_time = 'file'
66-
config_stop_time = '2301-01-15_00:00:00'
66+
config_stop_time = '2301-01-01_00:00:00'
6767
config_calendar_type = 'noleap'
6868

6969
config_stats_interval = 0

‎compass/landice/tests/ismip7_run/ismip7_gris/set_up_experiment.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,11 @@ def setup(self): # noqa: C901
278278
# --- Symlink restart for projections/ctrl ---
279279
if not is_historical:
280280
hist_exp = f"historical_{model}"
281-
os.symlink(f"../{hist_exp}/rst.2015-01-15.nc",
282-
os.path.join(self.work_dir, 'rst.2015-01-15.nc'))
281+
os.symlink(f"../{hist_exp}/rst.2015-01-01.nc",
282+
os.path.join(self.work_dir, 'rst.2015-01-01.nc'))
283283
with open(os.path.join(self.work_dir, "restart_timestamp"),
284284
"w") as text_file:
285-
text_file.write("2015-01-15_00:00:00")
285+
text_file.write("2015-01-01_00:00:00")
286286

287287
# --- Add albany yaml, graph file, load script, job script ---
288288
self.add_input_file(

‎compass/landice/tests/ismip7_run/ismip7_gris/streams.landice.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
type="input"
3232
filename_template="{{ input_file_SMB_forcing }}"
3333
input_interval="{{ forcing_interval_monthly }}"
34-
reference_time="2000-01-15_00:00:00"
34+
reference_time="2000-01-01_00:00:00"
3535
runtime_format="single_file">
3636
<var name="sfcMassBal"/>
3737
</stream>
@@ -40,7 +40,7 @@
4040
type="input"
4141
filename_template="{{ input_file_temperature_forcing }}"
4242
input_interval="{{ forcing_interval_monthly }}"
43-
reference_time="2000-01-15_00:00:00"
43+
reference_time="2000-01-01_00:00:00"
4444
runtime_format="single_file">
4545
<var name="surfaceAirTemperature"/>
4646
</stream>
@@ -49,7 +49,7 @@
4949
type="input"
5050
filename_template="{{ input_file_TF_forcing }}"
5151
input_interval="{{ forcing_interval_monthly }}"
52-
reference_time="2000-01-15_00:00:00"
52+
reference_time="2000-01-01_00:00:00"
5353
runtime_format="single_file">
5454
<var name="ismip6_2dThermalForcing"/>
5555
</stream>
@@ -58,7 +58,7 @@
5858
type="input"
5959
filename_template="{{ input_file_runoff_forcing }}"
6060
input_interval="{{ forcing_interval_monthly }}"
61-
reference_time="2000-01-15_00:00:00"
61+
reference_time="2000-01-01_00:00:00"
6262
runtime_format="single_file">
6363
<var name="ismip6Runoff"/>
6464
</stream>

0 commit comments

Comments
 (0)