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

Jump to bottom

Fix cf writing of 3d arrays #1170

Merged
merged 2 commits into from May 13, 2020
Merged

Fix cf writing of 3d arrays #1170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4f9ae5
Fix cf writing of 3d arrays
mraspaud Apr 30, 2020
b5bd072
Clean up cf's area2lonlat
mraspaud May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 26 additions & 0 deletions satpy/tests/writer_tests/test_cf.py
View file
Open in desktop
Expand Up @@ -907,6 +907,7 @@ def test_area2lonlat(self):
"""Test the conversion from areas to lon/lat."""
import pyresample.geometry
import xarray as xr
import dask.array as da
from satpy.writers.cf_writer import area2lonlat

area = pyresample.geometry.AreaDefinition(
Expand Down Expand Up @@ -934,6 +935,31 @@ def test_area2lonlat(self):
self.assertDictContainsSubset({'name': 'longitude', 'standard_name': 'longitude', 'units': 'degrees_east'},
lon.attrs)

area = pyresample.geometry.AreaDefinition(
'seviri',
'Native SEVIRI grid',
'geos',
"+a=6378169.0 +h=35785831.0 +b=6356583.8 +lon_0=0 +proj=geos",
10, 10,
[-5570248.686685662, -5567248.28340708, 5567248.28340708, 5570248.686685662]
)
lons_ref, lats_ref = area.get_lonlats()
dataarray = xr.DataArray(data=da.from_array(np.arange(3*10*10).reshape(3, 10, 10), chunks=(1, 5, 5)),
dims=('bands', 'y', 'x'), attrs={'area': area})
res = area2lonlat(dataarray)

# original should be unmodified
self.assertNotIn('longitude', dataarray.coords)
self.assertEqual(set(res.coords), {'longitude', 'latitude'})
lat = res['latitude']
lon = res['longitude']
self.assertTrue(np.all(lat.data == lats_ref))
self.assertTrue(np.all(lon.data == lons_ref))
self.assertDictContainsSubset({'name': 'latitude', 'standard_name': 'latitude', 'units': 'degrees_north'},
lat.attrs)
self.assertDictContainsSubset({'name': 'longitude', 'standard_name': 'longitude', 'units': 'degrees_east'},
lon.attrs)


def suite():
"""Test suite for this writer's tests."""
Expand Down
3 changes: 2 additions & 1 deletion satpy/writers/cf_writer.py
View file
Open in desktop
Expand Up @@ -167,7 +167,8 @@ def area2lonlat(dataarray):
"""Convert an area to longitudes and latitudes."""
dataarray = dataarray.copy()
area = dataarray.attrs['area']
chunks = getattr(dataarray.data, 'chunks', None)
ignore_dims = {dim: 0 for dim in dataarray.dims if dim not in ['x', 'y']}
chunks = getattr(dataarray.isel(**ignore_dims), 'chunks', None)
lons, lats = area.get_lonlats(chunks=chunks)
lons = xr.DataArray(lons, dims=['y', 'x'],
attrs={'name': "longitude",
Expand Down