fix: default direction is FORWARD

tsutterley · Jul 18, 2024 · 5710c70 · 5710c70
1 parent c3ff7c1
commit 5710c70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/pyTMD/crs.py b/pyTMD/crs.py
@@ -371,9 +371,7 @@ def direction(self):
         ``pyproj`` direction of the coordinate transform
         """
         # convert from input coordinates to model coordinates
-        if self._direction is None:
-            return None
-        elif (self._direction.upper() == 'F'):
+        if (self._direction is None) or (self._direction.upper() == 'F'):
             return pyproj.enums.TransformDirection.FORWARD
         # convert from model coordinates to coordinates
         elif (self._direction.upper() == 'B'):

diff --git a/pyTMD/io/ATLAS.py b/pyTMD/io/ATLAS.py
@@ -214,14 +214,18 @@ def extract_constants(
     xmin, xmax = np.min(ilon), np.max(ilon)
     ymin, ymax = np.min(ilat), np.max(ilat)
     kwargs.setdefault('bounds', [xmin, xmax, ymin, ymax])
+    # grid step size of tide model
+    dlon = lon[1] - lon[0]
+    # if global: extend limits
+    is_global = False
 
     # crop bathymetry data to (buffered) bounds
     # or adjust longitudinal convention to fit tide model
     if kwargs['crop'] and np.any(kwargs['bounds']):
         mlon, mlat = np.copy(lon), np.copy(lat)
         bathymetry, lon, lat = _crop(bathymetry, mlon, mlat,
             bounds=kwargs['bounds'],
-            buffer=5
+            buffer=4.0*dlon
         )
     elif (np.min(ilon) < 0.0) & (np.max(lon) > 180.0):
         # input points convention (-180:180)
@@ -232,10 +236,6 @@ def extract_constants(
         # tide model convention (-180:180)
         ilon[ilon > 180.0] -= 360.0
 
-    # grid step size of tide model
-    dlon = lon[1] - lon[0]
-    # if global: extend limits
-    is_global = False
     # replace original values with extend arrays/matrices
     if np.isclose(lon[-1] - lon[0], 360.0 - dlon):
         lon = _extend_array(lon, dlon)

diff --git a/pyTMD/io/OTIS.py b/pyTMD/io/OTIS.py
@@ -753,7 +753,7 @@ def interpolate_constants(
     ilat = np.atleast_1d(np.copy(ilat))
     # run wrapper function to convert coordinate systems of input lat/lon
     transformer = pyTMD.crs().get(EPSG)
-    x,y = transformer.transform(ilon, ilat, direction='FORWARD')
+    x,y = transformer.transform(ilon, ilat)
     is_geographic = transformer.is_geographic
     # adjust longitudinal convention of input latitude and longitude
     # to fit tide model convention
@@ -1972,8 +1972,8 @@ def _crop(
     ymin = bounds[2] - buffer
     ymax = bounds[3] + buffer
     # find indices for cropping
-    yind = np.flatnonzero((ilat >= ymin) & (ilat <= ymax))
-    xind = np.flatnonzero((ilon >= xmin) & (ilon <= xmax))
+    yind = np.flatnonzero((iy >= ymin) & (iy <= ymax))
+    xind = np.flatnonzero((ix >= xmin) & (ix <= xmax))
     # slices for cropping axes
     rows = slice(yind[0], yind[-1]+1)
     cols = slice(xind[0], xind[-1]+1)