Merge pull request #29 from TUW-GEO/grids_calc_lut

Grids calc lut

.travis.yml

@@ -1,13 +1,14 @@
 language: python
+sudo: false
 notifications:
   email: false
 python:
   # We don't actually use the Travis Python, but this keeps it organized.
   - "2.7"
   - "3.3"
   - "3.4"
+  - "3.5"
 install:
-  - sudo apt-get update
   # You may want to periodically update this, although the conda update
   # conda line below will keep everything up-to-date.  We do this
   # conditionally because it saves us some downloading if the version is

CHANGES.md

@@ -1,3 +1,7 @@
+# v0.1.4
+
+- fix bug in lookuptable generation when gpis have custom ordering
+
 # v0.1.3 #
 
 - change meaning and rename grid dimensions to lon2d, lat2d. They do now

pygeogrids/grids.py

@@ -475,6 +475,10 @@ def calc_lut(self, other, max_dist=np.Inf, into_subset=False):
                 gpi_lut = np.empty_like(self.gpis)
                 gpi_lut.fill(-1)
                 gpi_lut[self.subset] = active_lut
+            elif not self.gpidirect:
+                gpi_lut = np.empty(np.max(self.activegpis)+1, dtype=np.int64)
+                gpi_lut.fill(-1)
+                gpi_lut[self.activegpis] = active_lut
             else:
                 gpi_lut = active_lut
 

setup.py

@@ -89,7 +89,6 @@ def run_tests(self):
         params = {"args": self.test_args}
         if self.cov:
             params["args"] += self.cov
-            params["plugins"] = ["cov"]
         if self.junitxml:
             params["args"] += self.junitxml
         errno = pytest.main(**params)