Commit 12df213a authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Included scipy in requirements.txt. Improved code style.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 68cd2adc
......@@ -1337,11 +1337,16 @@ class Tie_Point_Grid_Interpolator(object):
xmin, ymin, xmax, ymax = GDF2pass.total_bounds
grid_res = outGridRes if outGridRes else int(min(xmax - xmin, ymax - ymin) / 250)
grid_x, grid_y = np.arange(xmin, xmax + grid_res, grid_res), np.arange(ymax, ymin - grid_res, -grid_res)
OK = OrdinaryKriging(X_coords, Y_coords, ABS_SHIFT, variogram_model='spherical', verbose=False)
zvalues, sigmasq = OK.execute('grid', grid_x, grid_y, backend='C', n_closest_points=12)
grid_res = outGridRes or int(min(xmax - xmin, ymax - ymin) / 250)
grid_x = np.arange(xmin, xmax + grid_res, grid_res)
grid_y = np.arange(ymax, ymin - grid_res, -grid_res)
OK = OrdinaryKriging(X_coords, Y_coords, ABS_SHIFT,
variogram_model='spherical',
verbose=False)
zvalues, sigmasq = OK.execute('grid', grid_x, grid_y,
backend='C',
n_closest_points=12)
# FIXME: revise this save-routine
if self.tpg.CPUs is None or self.tpg.CPUs > 1:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment