diff --git a/doc/source/conf.py b/doc/source/conf.py index 4024b9a..834380b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -53,7 +53,7 @@ # The short X.Y version. version = '0.8' # The full version, including alpha/beta/rc tags. -release = '0.8.2' +release = '0.8.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/karta/raster/grid.py b/karta/raster/grid.py index 46d71fa..e254161 100644 --- a/karta/raster/grid.py +++ b/karta/raster/grid.py @@ -756,8 +756,8 @@ def resample(self, dx, dy, method='nearest'): "(got {0}, {1})".format(dx, dy)) xmin, xmax, ymin, ymax = self.get_extent() - ny = int((ymax - ymin) // (dy / self.resolution[1])) + 1 - nx = int((xmax - xmin) // (dx / self.resolution[0])) + 1 + ny = int((ymax - ymin) // dy) + 1 + nx = int((xmax - xmin) // dx) + 1 t = self._transform tnew = (xmin-0.5*dx-0.5*t[4], ymin-0.5*dy-0.5*t[5], dx, dy, t[4], t[5]) diff --git a/karta/version.py b/karta/version.py index deded32..732155f 100644 --- a/karta/version.py +++ b/karta/version.py @@ -1 +1 @@ -__version__ = "0.8.2" +__version__ = "0.8.3" diff --git a/tests/grid_tests.py b/tests/grid_tests.py index 89d651b..22456ad 100644 --- a/tests/grid_tests.py +++ b/tests/grid_tests.py @@ -147,9 +147,9 @@ def makegrid(start, finish, n, res): return RegularGrid((0.0, 0.0, res, res, 0.0, 0.0), values=zz) # node numbers from a line with extreme edges at [0, 1] - g = makegrid(0.0, 1.0-2.0/300, 150, 1.0) - sol = makegrid(0.0, 1.0-6.0/300, 50, 3.0) - gnew = g.resample(3.0, 3.0, method='nearest') + g = makegrid(0.0, 1.0-2.0/300, 150, 2.0) + sol = makegrid(0.0, 1.0-6.0/300, 50, 6.0) + gnew = g.resample(6.0, 6.0, method='nearest') residue = gnew[:,:] - sol[:,:] self.assertTrue(np.max(np.abs(residue)) < 1e-12) return @@ -164,9 +164,9 @@ def makegrid(start, finish, n, res): return RegularGrid((0.0, 0.0, res, res, 0.0, 0.0), values=zz) # node numbers from a line with extreme edges at [0, 1] - g = makegrid(0.0, 1.0-2.0/300, 150, 1.0) - sol = makegrid(0.0, 1.0-6.0/300, 50, 3.0) - gnew = g.resample(3.0, 3.0, method='linear') + g = makegrid(0.0, 1.0-2.0/300, 150, 2.0) + sol = makegrid(0.0, 1.0-6.0/300, 50, 6.0) + gnew = g.resample(6.0, 6.0, method='linear') residue = gnew[:,:] - sol[:,:] self.assertTrue(np.max(np.abs(residue)) < 1e-12) return