Merge branch 'main' into depend/geopandas

oceanmodeling · Oct 14, 2022 · 012ce2c · 012ce2c
2 parents cc589dc + d580f28
commit 012ce2c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ appdirs = '*'
 geopandas = '<0.11'
 haversine = '*'
 matplotlib = '*'
-netCDF4 = '*'
+netCDF4 = '<1.6'
 numpy = '*'
 pandas = '*'
 paramiko = '*'

diff --git a/tests/data/reference/test_Stations/stations_1.fort.15 b/tests/data/reference/test_Stations/stations_1.fort.15
@@ -1,59 +1,55 @@
-14                                                              ! NSTAE                              
--79.1875     33.34375                                           ! 8662245                            
+13                                                              ! NSTAE                              
 -78.9375     33.65625                                           ! 8661070                            
 -80.875      32.03125                                           ! 8670870                            
 -77.9375     34.21875                                           ! 8658120                            
 -77.8125     34.21875                                           ! 8658163                            
 -75.5625     35.78125                                           ! 8652587                            
--75.75       36.1875                                            ! 8651370                            
 -75.6875     35.21875                                           ! 8654467                            
 -79.9375     32.78125                                           ! 8665530                            
 -76.6875     34.71875                                           ! 8656483                            
+-75.75       36.1875                                            ! 8651370                            
 -79.6875     32.84375                                           ! 8664941                            
 -80.4375     32.34375                                           ! 8668498                            
 -78.5        33.875                                             ! 8659897                            
 -75.625      35.21875                                           ! 8654400                            
-14                                                              ! NSTAV                              
--79.1875     33.34375                                           ! 8662245                            
+13                                                              ! NSTAV                              
 -78.9375     33.65625                                           ! 8661070                            
 -80.875      32.03125                                           ! 8670870                            
 -77.9375     34.21875                                           ! 8658120                            
 -77.8125     34.21875                                           ! 8658163                            
 -75.5625     35.78125                                           ! 8652587                            
--75.75       36.1875                                            ! 8651370                            
 -75.6875     35.21875                                           ! 8654467                            
 -79.9375     32.78125                                           ! 8665530                            
 -76.6875     34.71875                                           ! 8656483                            
+-75.75       36.1875                                            ! 8651370                            
 -79.6875     32.84375                                           ! 8664941                            
 -80.4375     32.34375                                           ! 8668498                            
 -78.5        33.875                                             ! 8659897                            
 -75.625      35.21875                                           ! 8654400                            
-14                                                              ! NSTAC                              
--79.1875     33.34375                                           ! 8662245                            
+13                                                              ! NSTAC                              
 -78.9375     33.65625                                           ! 8661070                            
 -80.875      32.03125                                           ! 8670870                            
 -77.9375     34.21875                                           ! 8658120                            
 -77.8125     34.21875                                           ! 8658163                            
 -75.5625     35.78125                                           ! 8652587                            
--75.75       36.1875                                            ! 8651370                            
 -75.6875     35.21875                                           ! 8654467                            
 -79.9375     32.78125                                           ! 8665530                            
 -76.6875     34.71875                                           ! 8656483                            
+-75.75       36.1875                                            ! 8651370                            
 -79.6875     32.84375                                           ! 8664941                            
 -80.4375     32.34375                                           ! 8668498                            
 -78.5        33.875                                             ! 8659897                            
 -75.625      35.21875                                           ! 8654400                            
-14                                                              ! NSTAM                              
--79.1875     33.34375                                           ! 8662245                            
+13                                                              ! NSTAM                              
 -78.9375     33.65625                                           ! 8661070                            
 -80.875      32.03125                                           ! 8670870                            
 -77.9375     34.21875                                           ! 8658120                            
 -77.8125     34.21875                                           ! 8658163                            
 -75.5625     35.78125                                           ! 8652587                            
--75.75       36.1875                                            ! 8651370                            
 -75.6875     35.21875                                           ! 8654467                            
 -79.9375     32.78125                                           ! 8665530                            
 -76.6875     34.71875                                           ! 8656483                            
+-75.75       36.1875                                            ! 8651370                            
 -79.6875     32.84375                                           ! 8664941                            
 -80.4375     32.34375                                           ! 8668498                            
 -78.5        33.875                                             ! 8659897                            

diff --git a/tests/data/reference/test_Stations/stations_2.fort.15 b/tests/data/reference/test_Stations/stations_2.fort.15
@@ -1,14 +1,13 @@
-14                                                              ! NSTAE                              
--79.1875     33.34375                                           ! 8662245                            
+13                                                              ! NSTAE                              
 -78.9375     33.65625                                           ! 8661070                            
 -80.875      32.03125                                           ! 8670870                            
 -77.9375     34.21875                                           ! 8658120                            
 -77.8125     34.21875                                           ! 8658163                            
 -75.5625     35.78125                                           ! 8652587                            
--75.75       36.1875                                            ! 8651370                            
 -75.6875     35.21875                                           ! 8654467                            
 -79.9375     32.78125                                           ! 8665530                            
 -76.6875     34.71875                                           ! 8656483                            
+-75.75       36.1875                                            ! 8651370                            
 -79.6875     32.84375                                           ! 8664941                            
 -80.4375     32.34375                                           ! 8668498                            
 -78.5        33.875                                             ! 8659897