Skip to content

Commit a598016

Browse files
ChrisBarker-NOAAChrisBarker-NOAA
committed
pulled in yeardata for 2026
1 parent ef49473 commit a598016

File tree

5 files changed

+155
-9
lines changed

5 files changed

+155
-9
lines changed

‎py_gnome/gnome/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# just so it will be in the namespace.
2323
from .gnomeobject import GnomeId, AddLogger
2424

25-
__version__ = "1.1.21"
25+
__version__ = "1.1.22"
2626

2727
# set up to show DeprecationWarnings that come from PyGNOME
2828
warnings.filterwarnings("default",

‎py_gnome/gnome/data/yeardata/#2026‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
0.967 066.4
2+
1.000 000.0
3+
0.967 059.7
4+
1.103 014.3
5+
0.936 132.7
6+
1.167 050.7
7+
0.905 199.1
8+
1.067 080.6
9+
1.000 000.0
10+
0.936 126.1
11+
0.967 138.4
12+
1.000 000.0
13+
0.967 131.7
14+
0.967 053.0
15+
1.695 160.8
16+
0.967 174.3
17+
1.000 180.0
18+
1.100 025.2
19+
1.152 022.4
20+
0.886 006.7
21+
1.000 201.3
22+
1.000 280.7
23+
0.967 294.6
24+
1.407 145.0
25+
1.167 122.7
26+
1.167 044.0
27+
1.000 002.7
28+
1.000 177.3
29+
1.167 037.3
30+
1.000 349.3
31+
0.967 293.6
32+
0.951 099.6
33+
1.329 251.0
34+
1.032 118.5
35+
1.283 208.9
36+
0.876 265.5
37+
0.967 066.4
38+
0.000 000.0
39+
0.000 000.0
40+
0.000 000.0
41+
0.000 000.0
42+
0.000 000.0
43+
0.000 000.0
44+
0.000 000.0
45+
0.000 000.0
46+
0.000 000.0
47+
0.000 000.0
48+
0.000 000.0
49+
0.000 000.0
50+
0.000 000.0
51+
0.000 000.0
52+
0.000 000.0
53+
0.000 000.0
54+
0.000 000.0
55+
0.000 000.0
56+
0.000 000.0
57+
0.000 000.0
58+
0.000 000.0
59+
0.000 000.0
60+
0.000 000.0
61+
0.000 000.0
62+
0.000 000.0
63+
0.000 000.0
64+
0.000 000.0
65+
0.000 000.0
66+
0.000 000.0
67+
0.000 000.0
68+
0.000 000.0
69+
0.000 000.0
70+
0.000 000.0
71+
0.000 000.0
72+
0.000 000.0
73+
0.000 000.0
74+
0.000 000.0
75+
0.000 000.0
76+
0.000 000.0
77+
0.000 000.0
78+
0.000 000.0
79+
0.000 000.0
80+
0.000 000.0
81+
0.000 000.0
82+
0.000 000.0
83+
0.000 000.0
84+
0.000 000.0
85+
0.000 000.0
86+
0.000 000.0
87+
0.000 000.0
88+
0.000 000.0
89+
0.000 000.0
90+
0.000 000.0
91+
0.000 000.0
92+
0.000 000.0
93+
0.000 000.0
94+
0.000 000.0
95+
0.000 000.0
96+
0.000 000.0
97+
0.000 000.0
98+
0.000 000.0
99+
0.000 000.0
100+
0.000 000.0
101+
0.000 000.0
102+
0.000 000.0
103+
0.000 000.0
104+
0.000 000.0
105+
0.000 000.0
106+
0.000 000.0
107+
0.000 000.0
108+
0.000 000.0
109+
0.000 000.0
110+
0.000 000.0
111+
0.000 000.0
112+
0.000 000.0
113+
0.000 000.0
114+
0.000 000.0
115+
0.000 000.0
116+
0.000 000.0
117+
0.000 000.0
118+
0.000 000.0
119+
0.000 000.0
120+
0.000 000.0
121+
0.000 000.0
122+
0.000 000.0
123+
0.000 000.0
124+
0.000 000.0
125+
0.000 000.0
126+
0.000 000.0
127+
0.000 000.0
128+
0.000 000.0

‎py_gnome/gnome/gnomeobject.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
SAVEFILE_VERSION = '5'
2626

2727

28+
2829
def class_from_objtype(obj_type):
2930
'''
3031
object type must be a string in the gnome namespace:
@@ -892,6 +893,7 @@ def save(self, saveloc='.', refs=None, overwrite=True):
892893
obj_json = self._schema()._save(self, zipfile_=zipfile_, refs=refs)
893894

894895
zipfile_.writestr('version.txt', SAVEFILE_VERSION)
896+
zipfile_.writestr('pygnome_version.txt', gnome.__version__)
895897

896898
if saveloc is None:
897899
log.info('Returning open zipfile in memory')

‎py_gnome/tests/unit_tests/test_cy/test_cy_shio_time.py‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,27 @@ def test_yeardata():
9696
def test_get_time_value():
9797
'make sure get_time_value goes to correct C++ derived class function'
9898
shio = CyShioTime(shio_file)
99-
t = time_utils.date_to_sec(datetime(2012, 8, 20, 13))
100-
time = [t + 3600.*dt for dt in range(10)]
99+
t = time_utils.date_to_sec(datetime(2026, 8, 20, 13))
100+
time = [t + 3600. * dt for dt in range(10)]
101101
vel_rec, err = shio.get_time_value(time)
102102
assert all(vel_rec['u'] != 0)
103103
assert all(vel_rec['v'] == 0)
104104

105105

106+
def test_get_time_value_out_of_range():
107+
"""
108+
Make sure you get a meaningful error if you ask for
109+
a year that isn't supported by yeardata.
110+
111+
1/7/2026 -- added 2026 data.
112+
"""
113+
shio = CyShioTime(shio_file)
114+
t = time_utils.date_to_sec(datetime(2030, 8, 20, 13))
115+
# time = [t + 3600. * dt for dt in range(10)]
116+
with pytest.raises(IndexError):
117+
vel_rec, err = shio.get_time_value(t)
118+
119+
106120
def test_eq():
107121
shio = CyShioTime(shio_file)
108122

‎py_gnome/tests/unit_tests/test_environment/test_tide.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
Test all operations for cats mover work
33
'''
44

5-
6-
7-
8-
95
import os
106

117
import pytest
@@ -25,13 +21,19 @@
2521
def test_shio_data_limits():
2622
"""
2723
make sure we can get the SHIO year data limits
24+
25+
This is determined by the yeardata in the gnome/data/yeardata folder
26+
27+
1/7/2026 : added the 2026 yeardata
2828
"""
29-
assert SHIO_YEARDATA_LIMITS == (1980, 2025)
29+
print(SHIO_YEARDATA_LIMITS)
30+
31+
assert SHIO_YEARDATA_LIMITS == (1980, 2026)
3032

3133

3234
def test_exceptions():
3335
"""
34-
Test correct exceptions are raised
36+
Test correct exceptions are raised
3537
"""
3638
bad_file = 'CLISShio.txtX'
3739
bad_yeardata_path = os.path.join('Data', 'yeardata')

0 commit comments

Comments
 (0)