Merge pull request #142 from barronh/bugfix/gcnc-ll2ij

Bugfix/gcnc ll2ij

Author: barronh

setup.py

@@ -83,7 +83,7 @@ def find_data():
 
 setup(
     name='PseudoNetCDF',
-    version='3.2.2',
+    version='3.2.3',
     author='Barron Henderson',
     author_email='barronh@gmail.com',
     maintainer='Barron Henderson',

src/PseudoNetCDF/geoschemfiles/_gcnc.py

@@ -69,21 +69,21 @@ def ll2ij(self, lon, lat, bounds='error', clean='none'):
         else:
             missi, = np.where(i.mask)
             missj, = np.where(j.mask)
-            lowi, = np.where(~easter[missi].any(1))
-            highi, = np.where(~wester[missi].any(1))
-            lowj, = np.where(~norther[missj].any(1))
-            highj, = np.where(~souther[missj].any(1))
-            outb = (lowi | lowj | highi | highj)
+            outb = i.mask | j.mask
             nout = outb.sum()
             if nout > 0:
-                message = '{} Points out of bounds; {}'.format(
-                    nout, np.where(outb))
+                message = '{} Points out of bounds {:.1%}; {}'.format(
+                    nout, nout/i.size, np.where(outb))
                 if bounds == 'error':
                     raise ValueError(message)
                 else:
                     warn(message)
 
         if clean == 'clip':
+            highi, = np.where(easter[:].all(1))
+            lowi, = np.where(wester[:].all(1))
+            highj, = np.where(norther[:].all(1))
+            lowj, = np.where(souther[:].all(1))
             i[lowi] = 0
             i[highi] = nx - 1
             j[lowj] = 0