Skip to content

Commit 012ce2c

Browse files
Merge branch 'main' into depend/geopandas
2 parents cc589dc + d580f28 commit 012ce2c

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ appdirs = '*'
2424
geopandas = '<0.11'
2525
haversine = '*'
2626
matplotlib = '*'
27-
netCDF4 = '*'
27+
netCDF4 = '<1.6'
2828
numpy = '*'
2929
pandas = '*'
3030
paramiko = '*'

tests/data/reference/test_Stations/stations_1.fort.15

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,55 @@
1-
14 ! NSTAE
2-
-79.1875 33.34375 ! 8662245
1+
13 ! NSTAE
32
-78.9375 33.65625 ! 8661070
43
-80.875 32.03125 ! 8670870
54
-77.9375 34.21875 ! 8658120
65
-77.8125 34.21875 ! 8658163
76
-75.5625 35.78125 ! 8652587
8-
-75.75 36.1875 ! 8651370
97
-75.6875 35.21875 ! 8654467
108
-79.9375 32.78125 ! 8665530
119
-76.6875 34.71875 ! 8656483
10+
-75.75 36.1875 ! 8651370
1211
-79.6875 32.84375 ! 8664941
1312
-80.4375 32.34375 ! 8668498
1413
-78.5 33.875 ! 8659897
1514
-75.625 35.21875 ! 8654400
16-
14 ! NSTAV
17-
-79.1875 33.34375 ! 8662245
15+
13 ! NSTAV
1816
-78.9375 33.65625 ! 8661070
1917
-80.875 32.03125 ! 8670870
2018
-77.9375 34.21875 ! 8658120
2119
-77.8125 34.21875 ! 8658163
2220
-75.5625 35.78125 ! 8652587
23-
-75.75 36.1875 ! 8651370
2421
-75.6875 35.21875 ! 8654467
2522
-79.9375 32.78125 ! 8665530
2623
-76.6875 34.71875 ! 8656483
24+
-75.75 36.1875 ! 8651370
2725
-79.6875 32.84375 ! 8664941
2826
-80.4375 32.34375 ! 8668498
2927
-78.5 33.875 ! 8659897
3028
-75.625 35.21875 ! 8654400
31-
14 ! NSTAC
32-
-79.1875 33.34375 ! 8662245
29+
13 ! NSTAC
3330
-78.9375 33.65625 ! 8661070
3431
-80.875 32.03125 ! 8670870
3532
-77.9375 34.21875 ! 8658120
3633
-77.8125 34.21875 ! 8658163
3734
-75.5625 35.78125 ! 8652587
38-
-75.75 36.1875 ! 8651370
3935
-75.6875 35.21875 ! 8654467
4036
-79.9375 32.78125 ! 8665530
4137
-76.6875 34.71875 ! 8656483
38+
-75.75 36.1875 ! 8651370
4239
-79.6875 32.84375 ! 8664941
4340
-80.4375 32.34375 ! 8668498
4441
-78.5 33.875 ! 8659897
4542
-75.625 35.21875 ! 8654400
46-
14 ! NSTAM
47-
-79.1875 33.34375 ! 8662245
43+
13 ! NSTAM
4844
-78.9375 33.65625 ! 8661070
4945
-80.875 32.03125 ! 8670870
5046
-77.9375 34.21875 ! 8658120
5147
-77.8125 34.21875 ! 8658163
5248
-75.5625 35.78125 ! 8652587
53-
-75.75 36.1875 ! 8651370
5449
-75.6875 35.21875 ! 8654467
5550
-79.9375 32.78125 ! 8665530
5651
-76.6875 34.71875 ! 8656483
52+
-75.75 36.1875 ! 8651370
5753
-79.6875 32.84375 ! 8664941
5854
-80.4375 32.34375 ! 8668498
5955
-78.5 33.875 ! 8659897

tests/data/reference/test_Stations/stations_2.fort.15

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
14 ! NSTAE
2-
-79.1875 33.34375 ! 8662245
1+
13 ! NSTAE
32
-78.9375 33.65625 ! 8661070
43
-80.875 32.03125 ! 8670870
54
-77.9375 34.21875 ! 8658120
65
-77.8125 34.21875 ! 8658163
76
-75.5625 35.78125 ! 8652587
8-
-75.75 36.1875 ! 8651370
97
-75.6875 35.21875 ! 8654467
108
-79.9375 32.78125 ! 8665530
119
-76.6875 34.71875 ! 8656483
10+
-75.75 36.1875 ! 8651370
1211
-79.6875 32.84375 ! 8664941
1312
-80.4375 32.34375 ! 8668498
1413
-78.5 33.875 ! 8659897

0 commit comments

Comments
 (0)