Skip to content

Commit b00181d

Browse files
seismanweiji14
andauthored
Fix tests for Aug 2023 updated remote datasets (#2636)
Co-authored-by: Wei Ji <[email protected]>
1 parent 26d4fed commit b00181d

6 files changed

+64
-60
lines changed

pygmt/tests/test_datasets_earth_age.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_earth_age_01d():
4040
assert data.gmt.registration == 0
4141
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
4242
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
43-
npt.assert_allclose(data.min(), 0.167381, rtol=1e-5)
44-
npt.assert_allclose(data.max(), 338.0274, rtol=1e-5)
43+
npt.assert_allclose(data.min(), 0.17, atol=0.01)
44+
npt.assert_allclose(data.max(), 338.02, atol=0.01)
4545

4646

4747
def test_earth_age_01d_with_region():
@@ -53,8 +53,8 @@ def test_earth_age_01d_with_region():
5353
assert data.gmt.registration == 0
5454
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
5555
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
56-
npt.assert_allclose(data.min(), 11.293945, rtol=1e-5)
57-
npt.assert_allclose(data.max(), 125.1189, rtol=1e-5)
56+
npt.assert_allclose(data.min(), 11.29, atol=0.01)
57+
npt.assert_allclose(data.max(), 125.12, atol=0.01)
5858

5959

6060
def test_earth_age_01m_without_region():
@@ -86,5 +86,5 @@ def test_earth_age_01m_default_registration():
8686
assert data.coords["lat"].data.max() == 5.0
8787
assert data.coords["lon"].data.min() == -10.0
8888
assert data.coords["lon"].data.max() == -9.0
89-
npt.assert_allclose(data.min(), 88.63)
90-
npt.assert_allclose(data.max(), 125.25)
89+
npt.assert_allclose(data.min(), 88.63, atol=0.01)
90+
npt.assert_allclose(data.max(), 125.25, atol=0.01)

pygmt/tests/test_datasets_earth_free_air_anomaly.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_earth_faa_01d():
4040
assert data.gmt.registration == 0
4141
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
4242
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
43-
npt.assert_allclose(data.min(), -275.75)
44-
npt.assert_allclose(data.max(), 308.375)
43+
npt.assert_allclose(data.min(), -275.85, atol=0.025)
44+
npt.assert_allclose(data.max(), 308.35, atol=0.025)
4545

4646

4747
def test_earth_faa_01d_with_region():
@@ -53,8 +53,8 @@ def test_earth_faa_01d_with_region():
5353
assert data.gmt.registration == 0
5454
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
5555
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
56-
npt.assert_allclose(data.min(), -58.75)
57-
npt.assert_allclose(data.max(), 69.524994)
56+
npt.assert_allclose(data.min(), -58.475, atol=0.025)
57+
npt.assert_allclose(data.max(), 69.975, atol=0.025)
5858

5959

6060
def test_earth_faa_01m_without_region():
@@ -78,5 +78,5 @@ def test_earth_faa_01m_default_registration():
7878
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
7979
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)
8080
npt.assert_allclose(data.coords["lon"].data.max(), -9.00833333)
81-
npt.assert_allclose(data.min(), -51)
82-
npt.assert_allclose(data.max(), 113.675)
81+
npt.assert_allclose(data.min(), -49.225, atol=0.025)
82+
npt.assert_allclose(data.max(), 115.0, atol=0.025)

pygmt/tests/test_datasets_earth_geoid.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_earth_geoid_01d():
4040
assert data.gmt.registration == 0
4141
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
4242
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
43-
npt.assert_allclose(data.min(), -106.45)
44-
npt.assert_allclose(data.max(), 83.619995)
43+
npt.assert_allclose(data.min(), -106.45, atol=0.01)
44+
npt.assert_allclose(data.max(), 83.62, atol=0.01)
4545

4646

4747
def test_earth_geoid_01d_with_region():
@@ -53,8 +53,8 @@ def test_earth_geoid_01d_with_region():
5353
assert data.gmt.registration == 0
5454
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
5555
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
56-
npt.assert_allclose(data.min(), 4.87)
57-
npt.assert_allclose(data.max(), 29.89)
56+
npt.assert_allclose(data.min(), 4.87, atol=0.01)
57+
npt.assert_allclose(data.max(), 29.89, atol=0.01)
5858

5959

6060
def test_earth_geoid_01m_without_region():
@@ -86,5 +86,5 @@ def test_earth_geoid_01m_default_registration():
8686
assert data.coords["lat"].data.max() == 5.0
8787
assert data.coords["lon"].data.min() == -10.0
8888
assert data.coords["lon"].data.max() == -9.0
89-
npt.assert_allclose(data.min(), 20.34)
90-
npt.assert_allclose(data.max(), 30.039999)
89+
npt.assert_allclose(data.min(), 20.34, atol=0.01)
90+
npt.assert_allclose(data.max(), 30.04, atol=0.01)

pygmt/tests/test_datasets_earth_magnetic_anomaly.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def test_earth_mag_01d():
4040
assert data.gmt.registration == 0
4141
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
4242
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
43-
npt.assert_allclose(data.min(), -384)
44-
npt.assert_allclose(data.max(), 1057.2)
43+
npt.assert_allclose(data.min(), -384.0, atol=0.2)
44+
npt.assert_allclose(data.max(), 1057.2, atol=0.2)
4545

4646

4747
def test_earth_mag_01d_with_region():
@@ -53,8 +53,8 @@ def test_earth_mag_01d_with_region():
5353
assert data.gmt.registration == 0
5454
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
5555
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
56-
npt.assert_allclose(data.min(), -180.40002, rtol=1e-5)
57-
npt.assert_allclose(data.max(), 127.39996, rtol=1e-5)
56+
npt.assert_allclose(data.min(), -180.4, atol=0.2)
57+
npt.assert_allclose(data.max(), 127.4, atol=0.2)
5858

5959

6060
def test_earth_mag_02m_without_region():
@@ -92,8 +92,8 @@ def test_earth_mag_02m_default_registration():
9292
npt.assert_allclose(data.coords["lat"].data.max(), 4.983333333)
9393
npt.assert_allclose(data.coords["lon"].data.min(), -9.98333333)
9494
npt.assert_allclose(data.coords["lon"].data.max(), -9.01666667)
95-
npt.assert_allclose(data.min(), -231)
96-
npt.assert_allclose(data.max(), 131.79999)
95+
npt.assert_allclose(data.min(), -231.0, atol=0.2)
96+
npt.assert_allclose(data.max(), 131.8, atol=0.2)
9797

9898

9999
def test_earth_mag4km_01d():
@@ -109,8 +109,8 @@ def test_earth_mag4km_01d():
109109
assert data.gmt.registration == 0
110110
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
111111
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
112-
npt.assert_allclose(data.min(), -799.19995)
113-
npt.assert_allclose(data.max(), 3226.4)
112+
npt.assert_allclose(data.min(), -799.2, atol=0.2)
113+
npt.assert_allclose(data.max(), 3226.4, atol=0.2)
114114

115115

116116
def test_earth_mag4km_01d_with_region():
@@ -126,8 +126,8 @@ def test_earth_mag4km_01d_with_region():
126126
assert data.shape == (11, 21)
127127
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
128128
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
129-
npt.assert_allclose(data.min(), -153.19995, rtol=1e-5)
130-
npt.assert_allclose(data.max(), 113.59985, rtol=1e-5)
129+
npt.assert_allclose(data.min(), -153.2, atol=0.2)
130+
npt.assert_allclose(data.max(), 113.6, atol=0.2)
131131

132132

133133
def test_earth_mag4km_02m_default_registration():
@@ -146,8 +146,8 @@ def test_earth_mag4km_02m_default_registration():
146146
npt.assert_allclose(data.coords["lat"].data.max(), 5.98333333)
147147
npt.assert_allclose(data.coords["lon"].data.min(), -114.98333333)
148148
npt.assert_allclose(data.coords["lon"].data.max(), -112.01666667)
149-
npt.assert_allclose(data.min(), -132.80005, rtol=1e-5)
150-
npt.assert_allclose(data.max(), 79.59985, rtol=1e-5)
149+
npt.assert_allclose(data.min(), -132.8, atol=0.2)
150+
npt.assert_allclose(data.max(), 79.6, atol=0.2)
151151

152152

153153
def test_earth_mag_01d_wdmam():
@@ -164,8 +164,8 @@ def test_earth_mag_01d_wdmam():
164164
assert data.shape == (181, 361)
165165
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
166166
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
167-
npt.assert_allclose(data.min(), -773.5)
168-
npt.assert_allclose(data.max(), 1751.3)
167+
npt.assert_allclose(data.min(), -794.0, atol=0.2)
168+
npt.assert_allclose(data.max(), 2169.8, atol=0.2)
169169

170170

171171
def test_earth_mag_01d_wdmam_with_region():
@@ -181,8 +181,8 @@ def test_earth_mag_01d_wdmam_with_region():
181181
assert data.shape == (11, 21)
182182
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
183183
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
184-
npt.assert_allclose(data.min(), -103.900024, rtol=1e-5)
185-
npt.assert_allclose(data.max(), 102.19995, rtol=1e-5)
184+
npt.assert_allclose(data.min(), -145.6, atol=0.2)
185+
npt.assert_allclose(data.max(), 107.6, atol=0.2)
186186

187187

188188
def test_earth_mag_03m_wdmam_with_region():
@@ -198,8 +198,8 @@ def test_earth_mag_03m_wdmam_with_region():
198198
assert data.lat.max() == -58
199199
assert data.lon.min() == 10
200200
assert data.lon.max() == 13
201-
npt.assert_allclose(data.min(), -639.7001)
202-
npt.assert_allclose(data.max(), 629.6)
201+
npt.assert_allclose(data.min(), -790.2, atol=0.2)
202+
npt.assert_allclose(data.max(), 528.0, atol=0.2)
203203

204204

205205
def test_earth_mag_03m_wdmam_without_region():

pygmt/tests/test_datasets_earth_relief.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_earth_relief_01d_igpp_synbath(data_source):
3737
assert data.shape == (181, 361)
3838
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
3939
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
40-
npt.assert_allclose(data.min(), -8600.5)
41-
npt.assert_allclose(data.max(), 5559.0)
40+
npt.assert_allclose(data.min(), -8600.5, atol=0.5)
41+
npt.assert_allclose(data.max(), 5559.0, atol=0.5)
4242

4343

4444
@pytest.mark.parametrize("data_source", ["gebco", "gebcosi"])
@@ -48,12 +48,16 @@ def test_earth_relief_01d_gebco(data_source):
4848
data.
4949
"""
5050
data = load_earth_relief(resolution="01d", data_source=data_source)
51+
assert data.attrs["units"] == "meters"
52+
assert data.attrs["long_name"] == "Earth elevation relative to the geoid"
53+
assert data.attrs["vertical_datum"] == "EGM96"
54+
assert data.attrs["horizontal_datum"] == "WGS84"
5155
assert data.shape == (181, 361)
5256
assert data.gmt.registration == 0
5357
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
5458
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
55-
npt.assert_allclose(data.min(), -8598)
56-
npt.assert_allclose(data.max(), 5559.0)
59+
npt.assert_allclose(data.min(), -8597.0, atol=1.0)
60+
npt.assert_allclose(data.max(), 5559.0, atol=1.0)
5761

5862

5963
def test_earth_relief_01d_with_region_srtm():
@@ -69,8 +73,8 @@ def test_earth_relief_01d_with_region_srtm():
6973
assert data.gmt.registration == 0
7074
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
7175
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
72-
npt.assert_allclose(data.min(), -5154)
73-
npt.assert_allclose(data.max(), 805.5)
76+
npt.assert_allclose(data.min(), -5151, atol=0.5)
77+
npt.assert_allclose(data.max(), 805.5, atol=0.5)
7478

7579

7680
def test_earth_relief_01d_with_region_gebco():
@@ -86,8 +90,8 @@ def test_earth_relief_01d_with_region_gebco():
8690
assert data.gmt.registration == 0
8791
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
8892
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
89-
npt.assert_allclose(data.min(), -5146)
90-
npt.assert_allclose(data.max(), 806)
93+
npt.assert_allclose(data.min(), -5151.0, atol=1.0)
94+
npt.assert_allclose(data.max(), 806.0, atol=1.0)
9195

9296

9397
def test_earth_relief_30m():
@@ -99,8 +103,8 @@ def test_earth_relief_30m():
99103
assert data.gmt.registration == 0
100104
npt.assert_allclose(data.lat, np.arange(-90, 90.5, 0.5))
101105
npt.assert_allclose(data.lon, np.arange(-180, 180.5, 0.5))
102-
npt.assert_allclose(data.min(), -9454.5)
103-
npt.assert_allclose(data.max(), 5887.5)
106+
npt.assert_allclose(data.min(), -9454.5, atol=0.5)
107+
npt.assert_allclose(data.max(), 5887.5, atol=0.5)
104108

105109

106110
def test_earth_gebcosi_15m_with_region():
@@ -117,8 +121,8 @@ def test_earth_gebcosi_15m_with_region():
117121
assert data.gmt.registration == 1
118122
npt.assert_allclose(data.lat, np.arange(-87.875, -84, 0.25))
119123
npt.assert_allclose(data.lon, np.arange(85.125, 87, 0.25))
120-
npt.assert_allclose(data.min(), -531)
121-
npt.assert_allclose(data.max(), 474)
124+
npt.assert_allclose(data.min(), -531, atol=1.0)
125+
npt.assert_allclose(data.max(), 474, atol=1.0)
122126

123127

124128
def test_earth_relief_30s_synbath():
@@ -132,8 +136,8 @@ def test_earth_relief_30s_synbath():
132136
data_source="synbath",
133137
)
134138
assert data.shape == (60, 120)
135-
npt.assert_allclose(data.min(), -3552.5)
136-
npt.assert_allclose(data.max(), -2154)
139+
npt.assert_allclose(data.min(), -3552.5, atol=0.5)
140+
npt.assert_allclose(data.max(), -2257.5, atol=0.5)
137141

138142

139143
def test_earth_relief_01m_without_region():
@@ -244,8 +248,8 @@ def test_earth_relief_15s_default_registration():
244248
npt.assert_allclose(data.coords["lat"].data.max(), 4.997917)
245249
npt.assert_allclose(data.coords["lon"].data.min(), -9.997917)
246250
npt.assert_allclose(data.coords["lon"].data.max(), -9.502083)
247-
npt.assert_allclose(data.min(), -3897)
248-
npt.assert_allclose(data.max(), -74)
251+
npt.assert_allclose(data.min(), -3897, atol=0.5)
252+
npt.assert_allclose(data.max(), -71, atol=0.5)
249253

250254

251255
def test_earth_relief_03s_default_registration():
@@ -260,5 +264,5 @@ def test_earth_relief_03s_default_registration():
260264
npt.assert_allclose(data.coords["lat"].data.max(), 5)
261265
npt.assert_allclose(data.coords["lon"].data.min(), -10)
262266
npt.assert_allclose(data.coords["lon"].data.max(), -9.8)
263-
npt.assert_allclose(data.min(), -2069.996)
264-
npt.assert_allclose(data.max(), -924.0801)
267+
npt.assert_allclose(data.min(), -2070.0, atol=0.5)
268+
npt.assert_allclose(data.max(), -924.5, atol=0.5)

pygmt/tests/test_datasets_earth_vertical_gravity_gradient.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ def test_earth_vertical_gravity_gradient_01d():
4242
assert data.gmt.registration == 0
4343
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
4444
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
45-
npt.assert_allclose(data.min(), -136.34375)
46-
npt.assert_allclose(data.max(), 104.59375)
45+
npt.assert_allclose(data.min(), -137.125, atol=1 / 32)
46+
npt.assert_allclose(data.max(), 104.59375, atol=1 / 32)
4747
assert data[1, 1].isnull()
4848

4949

@@ -58,8 +58,8 @@ def test_earth_vertical_gravity_gradient_01d_with_region():
5858
assert data.gmt.registration == 0
5959
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
6060
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
61-
npt.assert_allclose(data.min(), -16.34375)
62-
npt.assert_allclose(data.max(), 19.78125)
61+
npt.assert_allclose(data.min(), -15.6875, atol=1 / 32)
62+
npt.assert_allclose(data.max(), 19.875, atol=1 / 32)
6363

6464

6565
def test_earth_vertical_gravity_gradient_01m_without_region():
@@ -95,5 +95,5 @@ def test_earth_vertical_gravity_gradient_01m_default_registration():
9595
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
9696
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)
9797
npt.assert_allclose(data.coords["lon"].data.max(), -9.00833333)
98-
npt.assert_allclose(data.min(), -40.25)
99-
npt.assert_allclose(data.max(), 81.75)
98+
npt.assert_allclose(data.min(), -37.5625, atol=1 / 32)
99+
npt.assert_allclose(data.max(), 82.59375, atol=1 / 32)

0 commit comments

Comments
 (0)