Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dem gridded_data shifted coordinates #1682

Merged
merged 6 commits into from
Jan 30, 2024
Merged

Dem gridded_data shifted coordinates #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
441f0cc
added test for shifted coordinates
pat-schmitt Jan 24, 2024
34166e0
use corner grid in gridded_data_var_to_geotiff
pat-schmitt Jan 29, 2024
ea7a032
adapt test
pat-schmitt Jan 29, 2024
7b0d8f6
use rioxarray for opening tiff-files in tests
pat-schmitt Jan 29, 2024
f593961
added whats-new
pat-schmitt Jan 29, 2024
6b0eb17
use pytest.importorskip for rioxarray in tests
pat-schmitt Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Bug fixes
glacier mask when preserving the total values. This is a bad
bug that is now fixed (:pull:`1661`).
By `Patrick Schmitt <https://github.com/pat-schmitt>`_
- When converting a variable of gridded_data to an tiff-file using
``tasks.gridded_data_var_to_geotiff`` the resulting coordinates where
shifted half a pixel, this is now fixed (:pull:`1682`).
By `Patrick Schmitt <https://github.com/pat-schmitt>`_


v1.6.1 (August 27, 2023)
Expand Down
2 changes: 1 addition & 1 deletion oggm/core/gis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,7 +1678,7 @@ def gridded_data_var_to_geotiff(gdir, varname, fname=None):
# Prepare the profile dict
crs = ds.pyproj_srs
var = ds[varname]
grid = ds.salem.grid
grid = ds.salem.grid.corner_grid
data = var.data
data_type = data.dtype.name
height, width = var.data.shape
Expand Down
13 changes: 11 additions & 2 deletions oggm/tests/test_prepro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
salem = pytest.importorskip('salem')
rasterio = pytest.importorskip('rasterio')
gpd = pytest.importorskip('geopandas')
rioxr = pytest.importorskip('rioxarray')

# Local imports
import oggm
Expand Down Expand Up @@ -514,10 +515,18 @@ def test_gridded_data_var_to_geotiff(self):

with xr.open_dataset(gdir.get_filepath('gridded_data')) as ds:
gridded_topo = ds[target_var]
gtiff_ds = salem.open_xr_dataset(gtiff_path)
assert ds.salem.grid == gtiff_ds.salem.grid
gtiff_ds = rioxr.open_rasterio(gtiff_path)
np.allclose(ds.salem.grid.x_coord, gtiff_ds.x)
np.allclose(ds.salem.grid.y_coord, gtiff_ds.y)
assert np.allclose(gridded_topo.data, gtiff_ds.data)

# compare coordinates of topo.tif with dem.tif
demtiff_ds = rioxr.open_rasterio(gdir.get_filepath('dem'))
gtiff_ds = rioxr.open_rasterio(gtiff_path)
assert np.allclose(demtiff_ds.data, gtiff_ds.data)
assert np.allclose(demtiff_ds.x, gtiff_ds.x)
assert np.allclose(demtiff_ds.y, gtiff_ds.y)


class TestCenterlines(unittest.TestCase):

Expand Down