Skip to content

Commit 84921a0

Browse files
weiji14seisman
weiji14
and
seisman
authored
GMTDataArrayAccessor: Set registration and gtype properly as enums on accessor init (#3942)
* Change to `gtype is GridType` comparison * Change to `registration is GridRegistration` comparison * Set registration and gtype properly as enums on init --------- Co-authored-by: Dongdong Tian <[email protected]>
1 parent 3aebd0c commit 84921a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+156
-154
lines changed

‎pygmt/tests/test_binstats.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def test_binstats_no_outgrid():
4343
region="g",
4444
)
4545
assert temp_grid.dims == ("y", "x")
46-
assert temp_grid.gmt.gtype == GridType.CARTESIAN
47-
assert temp_grid.gmt.registration == GridRegistration.GRIDLINE
46+
assert temp_grid.gmt.gtype is GridType.CARTESIAN
47+
assert temp_grid.gmt.registration is GridRegistration.GRIDLINE
4848
npt.assert_allclose(temp_grid.max(), 35971536)
4949
npt.assert_allclose(temp_grid.min(), 53)
5050
npt.assert_allclose(temp_grid.median(), 1232714.5)

‎pygmt/tests/test_datasets_earth_age.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_earth_age_01d():
1919
assert data.attrs["units"] == "Myr"
2020
assert data.attrs["horizontal_datum"] == "WGS84"
2121
assert data.shape == (181, 361)
22-
assert data.gmt.registration == GridRegistration.GRIDLINE
22+
assert data.gmt.registration is GridRegistration.GRIDLINE
2323
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2424
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2525
npt.assert_allclose(data.min(), 0.37, atol=0.01)
@@ -32,7 +32,7 @@ def test_earth_age_01d_with_region():
3232
"""
3333
data = load_earth_age(resolution="01d", region=[-10, 10, -5, 5])
3434
assert data.shape == (11, 21)
35-
assert data.gmt.registration == GridRegistration.GRIDLINE
35+
assert data.gmt.registration is GridRegistration.GRIDLINE
3636
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3737
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3838
npt.assert_allclose(data.min(), 11.13, atol=0.01)
@@ -46,7 +46,7 @@ def test_earth_age_01m_default_registration():
4646
"""
4747
data = load_earth_age(resolution="01m", region=[-10, -9, 3, 5])
4848
assert data.shape == (121, 61)
49-
assert data.gmt.registration == GridRegistration.GRIDLINE
49+
assert data.gmt.registration is GridRegistration.GRIDLINE
5050
assert data.coords["lat"].data.min() == 3.0
5151
assert data.coords["lat"].data.max() == 5.0
5252
assert data.coords["lon"].data.min() == -10.0

‎pygmt/tests/test_datasets_earth_day.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def test_blue_marble_01d():
1919
assert data.attrs["description"] == "NASA Day Images"
2020
assert data.shape == (3, 180, 360)
2121
assert data.dtype == "uint8"
22-
assert data.gmt.registration == GridRegistration.PIXEL
23-
assert data.gmt.gtype == GridType.GEOGRAPHIC
22+
assert data.gmt.registration is GridRegistration.PIXEL
23+
assert data.gmt.gtype is GridType.GEOGRAPHIC
2424
npt.assert_allclose(data.y, np.arange(89.5, -90.5, -1))
2525
npt.assert_allclose(data.x, np.arange(-179.5, 180.5, 1))
2626
npt.assert_allclose(data.min(), 10, atol=1)
@@ -34,8 +34,8 @@ def test_blue_marble_01d_with_region():
3434
data = load_blue_marble(resolution="01d", region=[-10, 10, -5, 5])
3535
assert data.shape == (3, 10, 20)
3636
assert data.dtype == "uint8"
37-
assert data.gmt.registration == GridRegistration.PIXEL
38-
assert data.gmt.gtype == GridType.GEOGRAPHIC
37+
assert data.gmt.registration is GridRegistration.PIXEL
38+
assert data.gmt.gtype is GridType.GEOGRAPHIC
3939
npt.assert_allclose(data.y, np.arange(4.5, -5.5, -1))
4040
npt.assert_allclose(data.x, np.arange(-9.5, 10.5, 1))
4141
npt.assert_allclose(data.min(), 10, atol=1)

‎pygmt/tests/test_datasets_earth_deflection.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_earth_edefl_01d():
2020
assert data.attrs["units"] == "micro-radians"
2121
assert data.attrs["horizontal_datum"] == "WGS84"
2222
assert data.shape == (181, 361)
23-
assert data.gmt.registration == GridRegistration.GRIDLINE
23+
assert data.gmt.registration is GridRegistration.GRIDLINE
2424
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2525
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2626
npt.assert_allclose(data.min(), -142.64, atol=0.04)
@@ -33,7 +33,7 @@ def test_earth_edefl_01d_with_region():
3333
"""
3434
data = load_earth_deflection(resolution="01d", region=[-10, 10, -5, 5])
3535
assert data.shape == (11, 21)
36-
assert data.gmt.registration == GridRegistration.GRIDLINE
36+
assert data.gmt.registration is GridRegistration.GRIDLINE
3737
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3838
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3939
npt.assert_allclose(data.min(), -28.92, atol=0.04)
@@ -47,7 +47,7 @@ def test_earth_edefl_01m_default_registration():
4747
"""
4848
data = load_earth_deflection(resolution="01m", region=[-10, -9, 3, 5])
4949
assert data.shape == (120, 60)
50-
assert data.gmt.registration == GridRegistration.PIXEL
50+
assert data.gmt.registration is GridRegistration.PIXEL
5151
npt.assert_allclose(data.coords["lat"].data.min(), 3.008333333)
5252
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
5353
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)
@@ -67,7 +67,7 @@ def test_earth_ndefl_01d():
6767
assert data.attrs["units"] == "micro-radians"
6868
assert data.attrs["horizontal_datum"] == "WGS84"
6969
assert data.shape == (181, 361)
70-
assert data.gmt.registration == GridRegistration.GRIDLINE
70+
assert data.gmt.registration is GridRegistration.GRIDLINE
7171
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
7272
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
7373
npt.assert_allclose(data.min(), -214.8, atol=0.04)
@@ -82,7 +82,7 @@ def test_earth_ndefl_01d_with_region():
8282
resolution="01d", region=[-10, 10, -5, 5], component="north"
8383
)
8484
assert data.shape == (11, 21)
85-
assert data.gmt.registration == GridRegistration.GRIDLINE
85+
assert data.gmt.registration is GridRegistration.GRIDLINE
8686
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
8787
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
8888
npt.assert_allclose(data.min(), -48.08, atol=0.04)
@@ -98,7 +98,7 @@ def test_earth_ndefl_01m_default_registration():
9898
resolution="01m", region=[-10, -9, 3, 5], component="north"
9999
)
100100
assert data.shape == (120, 60)
101-
assert data.gmt.registration == GridRegistration.PIXEL
101+
assert data.gmt.registration is GridRegistration.PIXEL
102102
npt.assert_allclose(data.coords["lat"].data.min(), 3.008333333)
103103
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
104104
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)

‎pygmt/tests/test_datasets_earth_dist.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_earth_dist_01d():
1818
assert data.attrs["units"] == "kilometers"
1919
assert data.attrs["horizontal_datum"] == "WGS84"
2020
assert data.shape == (181, 361)
21-
assert data.gmt.registration == GridRegistration.GRIDLINE
21+
assert data.gmt.registration is GridRegistration.GRIDLINE
2222
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2323
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2424
npt.assert_allclose(data.min(), -2655.7, atol=0.01)
@@ -31,7 +31,7 @@ def test_earth_dist_01d_with_region():
3131
"""
3232
data = load_earth_dist(resolution="01d", region=[-10, 10, -5, 5])
3333
assert data.shape == (11, 21)
34-
assert data.gmt.registration == GridRegistration.GRIDLINE
34+
assert data.gmt.registration is GridRegistration.GRIDLINE
3535
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3636
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3737
npt.assert_allclose(data.min(), -1081.94, atol=0.01)
@@ -45,7 +45,7 @@ def test_earth_dist_01m_default_registration():
4545
"""
4646
data = load_earth_dist(resolution="01m", region=[-10, -9, 3, 5])
4747
assert data.shape == (121, 61)
48-
assert data.gmt.registration == GridRegistration.GRIDLINE
48+
assert data.gmt.registration is GridRegistration.GRIDLINE
4949
assert data.coords["lat"].data.min() == 3.0
5050
assert data.coords["lat"].data.max() == 5.0
5151
assert data.coords["lon"].data.min() == -10.0

‎pygmt/tests/test_datasets_earth_free_air_anomaly.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_earth_faa_01d():
1919
assert data.attrs["units"] == "mGal"
2020
assert data.attrs["horizontal_datum"] == "WGS84"
2121
assert data.shape == (181, 361)
22-
assert data.gmt.registration == GridRegistration.GRIDLINE
22+
assert data.gmt.registration is GridRegistration.GRIDLINE
2323
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2424
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2525
npt.assert_allclose(data.min(), -188.85, atol=0.025)
@@ -32,7 +32,7 @@ def test_earth_faa_01d_with_region():
3232
"""
3333
data = load_earth_free_air_anomaly(resolution="01d", region=[-10, 10, -5, 5])
3434
assert data.shape == (11, 21)
35-
assert data.gmt.registration == GridRegistration.GRIDLINE
35+
assert data.gmt.registration is GridRegistration.GRIDLINE
3636
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3737
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3838
npt.assert_allclose(data.min(), -36.125, atol=0.025)
@@ -46,7 +46,7 @@ def test_earth_faa_01m_default_registration():
4646
"""
4747
data = load_earth_free_air_anomaly(resolution="01m", region=[-10, -9, 3, 5])
4848
assert data.shape == (120, 60)
49-
assert data.gmt.registration == GridRegistration.PIXEL
49+
assert data.gmt.registration is GridRegistration.PIXEL
5050
npt.assert_allclose(data.coords["lat"].data.min(), 3.008333333)
5151
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
5252
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)
@@ -66,7 +66,7 @@ def test_earth_faaerror_01d():
6666
assert data.attrs["units"] == "mGal"
6767
assert data.attrs["horizontal_datum"] == "WGS84"
6868
assert data.shape == (181, 361)
69-
assert data.gmt.registration == GridRegistration.GRIDLINE
69+
assert data.gmt.registration is GridRegistration.GRIDLINE
7070
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
7171
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
7272
npt.assert_allclose(data.min(), 0.0, atol=0.04)
@@ -81,7 +81,7 @@ def test_earth_faaerror_01d_with_region():
8181
resolution="01d", region=[-10, 10, -5, 5], uncertainty=True
8282
)
8383
assert data.shape == (11, 21)
84-
assert data.gmt.registration == GridRegistration.GRIDLINE
84+
assert data.gmt.registration is GridRegistration.GRIDLINE
8585
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
8686
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
8787
npt.assert_allclose(data.min(), 0.72, atol=0.04)
@@ -97,7 +97,7 @@ def test_earth_faaerror_01m_default_registration():
9797
resolution="01m", region=[-10, -9, 3, 5], uncertainty=True
9898
)
9999
assert data.shape == (120, 60)
100-
assert data.gmt.registration == GridRegistration.PIXEL
100+
assert data.gmt.registration is GridRegistration.PIXEL
101101
npt.assert_allclose(data.coords["lat"].data.min(), 3.008333333)
102102
npt.assert_allclose(data.coords["lat"].data.max(), 4.991666666)
103103
npt.assert_allclose(data.coords["lon"].data.min(), -9.99166666)

‎pygmt/tests/test_datasets_earth_geoid.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_earth_geoid_01d():
1919
assert data.attrs["units"] == "meters"
2020
assert data.attrs["horizontal_datum"] == "WGS84"
2121
assert data.shape == (181, 361)
22-
assert data.gmt.registration == GridRegistration.GRIDLINE
22+
assert data.gmt.registration is GridRegistration.GRIDLINE
2323
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2424
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2525
npt.assert_allclose(data.min(), -106.06, atol=0.01)
@@ -32,7 +32,7 @@ def test_earth_geoid_01d_with_region():
3232
"""
3333
data = load_earth_geoid(resolution="01d", region=[-10, 10, -5, 5])
3434
assert data.shape == (11, 21)
35-
assert data.gmt.registration == GridRegistration.GRIDLINE
35+
assert data.gmt.registration is GridRegistration.GRIDLINE
3636
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3737
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3838
npt.assert_allclose(data.min(), 5.57, atol=0.01)
@@ -46,7 +46,7 @@ def test_earth_geoid_01m_default_registration():
4646
"""
4747
data = load_earth_geoid(resolution="01m", region=[-10, -9, 3, 5])
4848
assert data.shape == (121, 61)
49-
assert data.gmt.registration == GridRegistration.GRIDLINE
49+
assert data.gmt.registration is GridRegistration.GRIDLINE
5050
assert data.coords["lat"].data.min() == 3.0
5151
assert data.coords["lat"].data.max() == 5.0
5252
assert data.coords["lon"].data.min() == -10.0

‎pygmt/tests/test_datasets_earth_magnetic_anomaly.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_earth_mag_01d():
2121
assert data.attrs["units"] == "nT"
2222
assert data.attrs["horizontal_datum"] == "WGS84"
2323
assert data.shape == (181, 361)
24-
assert data.gmt.registration == GridRegistration.GRIDLINE
24+
assert data.gmt.registration is GridRegistration.GRIDLINE
2525
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2626
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2727
npt.assert_allclose(data.min(), -336.2, atol=0.2)
@@ -34,7 +34,7 @@ def test_earth_mag_01d_with_region():
3434
"""
3535
data = load_earth_magnetic_anomaly(resolution="01d", region=[-10, 10, -5, 5])
3636
assert data.shape == (11, 21)
37-
assert data.gmt.registration == GridRegistration.GRIDLINE
37+
assert data.gmt.registration is GridRegistration.GRIDLINE
3838
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3939
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
4040
npt.assert_allclose(data.min(), -54.4, atol=0.2)
@@ -48,7 +48,7 @@ def test_earth_mag_02m_default_registration():
4848
"""
4949
data = load_earth_magnetic_anomaly(resolution="02m", region=[-10, -9, 3, 5])
5050
assert data.shape == (60, 30)
51-
assert data.gmt.registration == GridRegistration.PIXEL
51+
assert data.gmt.registration is GridRegistration.PIXEL
5252
npt.assert_allclose(data.coords["lat"].data.min(), 3.016666667)
5353
npt.assert_allclose(data.coords["lat"].data.max(), 4.983333333)
5454
npt.assert_allclose(data.coords["lon"].data.min(), -9.98333333)
@@ -68,7 +68,7 @@ def test_earth_mag4km_01d():
6868
assert data.attrs["units"] == "nT"
6969
assert data.attrs["horizontal_datum"] == "WGS84"
7070
assert data.shape == (181, 361)
71-
assert data.gmt.registration == GridRegistration.GRIDLINE
71+
assert data.gmt.registration is GridRegistration.GRIDLINE
7272
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
7373
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
7474
npt.assert_allclose(data.min(), -436.8, atol=0.2)
@@ -103,7 +103,7 @@ def test_earth_mag4km_02m_default_registration():
103103
data_source="emag2_4km",
104104
)
105105
assert data.shape == (60, 90)
106-
assert data.gmt.registration == GridRegistration.PIXEL
106+
assert data.gmt.registration is GridRegistration.PIXEL
107107
npt.assert_allclose(data.coords["lat"].data.min(), 4.01666667)
108108
npt.assert_allclose(data.coords["lat"].data.max(), 5.98333333)
109109
npt.assert_allclose(data.coords["lon"].data.min(), -114.98333333)
@@ -155,7 +155,7 @@ def test_earth_mag_03m_wdmam_with_region():
155155
data = load_earth_magnetic_anomaly(
156156
resolution="03m", region=[10, 13, -60, -58], data_source="wdmam"
157157
)
158-
assert data.gmt.registration == GridRegistration.GRIDLINE
158+
assert data.gmt.registration is GridRegistration.GRIDLINE
159159
assert data.shape == (41, 61)
160160
assert data.lat.min() == -60
161161
assert data.lat.max() == -58

‎pygmt/tests/test_datasets_earth_mask.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def test_earth_mask_01d():
1717
assert data.attrs["description"] == "GSHHG Earth mask"
1818
assert data.attrs["horizontal_datum"] == "WGS84"
1919
assert data.shape == (181, 361)
20-
assert data.gmt.registration == GridRegistration.GRIDLINE
21-
assert data.gmt.gtype == GridType.GEOGRAPHIC
20+
assert data.gmt.registration is GridRegistration.GRIDLINE
21+
assert data.gmt.gtype is GridType.GEOGRAPHIC
2222
assert data.dtype == "int8"
2323
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2424
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
@@ -33,8 +33,8 @@ def test_earth_mask_01d_with_region():
3333
"""
3434
data = load_earth_mask(resolution="01d", region=[-7, 4, 13, 19])
3535
assert data.shape == (7, 12)
36-
assert data.gmt.registration == GridRegistration.GRIDLINE
37-
assert data.gmt.gtype == GridType.GEOGRAPHIC
36+
assert data.gmt.registration is GridRegistration.GRIDLINE
37+
assert data.gmt.gtype is GridType.GEOGRAPHIC
3838
assert data.dtype == "int8"
3939
npt.assert_allclose(data.lat, np.arange(13, 20, 1))
4040
npt.assert_allclose(data.lon, np.arange(-7, 5, 1))

‎pygmt/tests/test_datasets_earth_mean_sea_surface.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def test_earth_mss_01d():
1818
assert data.attrs["units"] == "meters"
1919
assert data.attrs["horizontal_datum"] == "WGS84"
2020
assert data.shape == (181, 361)
21-
assert data.gmt.registration == GridRegistration.GRIDLINE
21+
assert data.gmt.registration is GridRegistration.GRIDLINE
2222
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
2323
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
2424
npt.assert_allclose(data.min(), -104.71, atol=0.01)
@@ -31,7 +31,7 @@ def test_earth_mss_01d_with_region():
3131
"""
3232
data = load_earth_mean_sea_surface(resolution="01d", region=[-10, 10, -5, 5])
3333
assert data.shape == (11, 21)
34-
assert data.gmt.registration == GridRegistration.GRIDLINE
34+
assert data.gmt.registration is GridRegistration.GRIDLINE
3535
npt.assert_allclose(data.lat, np.arange(-5, 6, 1))
3636
npt.assert_allclose(data.lon, np.arange(-10, 11, 1))
3737
npt.assert_allclose(data.min(), 6.53, atol=0.01)
@@ -45,7 +45,7 @@ def test_earth_mss_01m_default_registration():
4545
"""
4646
data = load_earth_mean_sea_surface(resolution="01m", region=[-10, -9, 3, 5])
4747
assert data.shape == (121, 61)
48-
assert data.gmt.registration == GridRegistration.GRIDLINE
48+
assert data.gmt.registration is GridRegistration.GRIDLINE
4949
assert data.coords["lat"].data.min() == 3.0
5050
assert data.coords["lat"].data.max() == 5.0
5151
assert data.coords["lon"].data.min() == -10.0

0 commit comments

Comments
 (0)