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 projections in cf writer #307

Merged

mraspaud merged 20 commits into master from fix-cf-writer

Jun 11, 2018

Member

mraspaud commented May 30, 2018 •

edited

This PR fixes the cf writer with better support for some projection parameters

Nina.Hakansson and others added 13 commits

January 12, 2018 15:59


          Allow save dateset to get keyword variables

bdcea38


          Added unittest for cf_writer to save array

aea6d9c


          Merge branch 'feature-xarray' into feature-xarray

26dd0e5


          Allow header attributes as input to save_datasets

519f15f


          Merge branch 'feature-xarray' of https://github.com/pytroll/satpy int…

7ecce5c

…o feature-xarray

Conflicts:
	satpy/writers/cf_writer.py


          Use netcdf engine specified in kwargs for save_dataset.

e58f413


          Added 2 unittest for cf writer

a1bd61d

One test for header attributes and one for encoding as a kwarg.


          Removed print statment

25f13db


          Run also the unittest for cf_writer

3eed0cf


          Added time_dimension and time_bounds to cf_writer

609f5a8


          Merge branch 'master' into feature-xarray

08db208


          Fix projections in cf writer

0a59f50


          Merge pull request #153 from ninahakansson/feature-xarray

ac774c0

[WIP] Improve compatibility of cf_writer with CF-conventions

stickler-ci reviewed

View reviewed changes

satpy/tests/writer_tests/test_cf.py Outdated

@@ @@ -40,7 +40,65 @@ @@
               class TestCFWriter(unittest.TestCase):
                   def test_init(self):
                       from satpy.writers.cf_writer import CFWriter
-                      w = CFWriter()
+                      import satpy.config
+                      w = CFWriter(config_files=[os.path.join(satpy.config.CONFIG_PATH,

Contributor

stickler-ci May 30, 2018

F841 local variable 'w' is assigned to but never used
W291 trailing whitespace

satpy/tests/writer_tests/test_cf.py Outdated

+                      import satpy.config
+                      w = CFWriter(config_files=[os.path.join(satpy.config.CONFIG_PATH,
+                                                              'writers', 'cf.yaml')])

Contributor

stickler-ci May 30, 2018

W293 blank line contains whitespace

satpy/tests/writer_tests/test_cf.py Outdated

		'writers', 'cf.yaml')])


		def test_save_array(self):

Contributor

stickler-ci May 30, 2018

E303 too many blank lines (2)

satpy/tests/writer_tests/test_cf.py Outdated

+                      import xarray as xr
+                      import tempfile
+                      scn = Scene()
+                      scn['test-array'] = xr.DataArray([1,2,3])

Contributor

stickler-ci May 30, 2018

E231 missing whitespace after ','

satpy/tests/writer_tests/test_cf.py Outdated

+                      scn.save_datasets(filename=filename, writer='cf')
+                      import h5netcdf as nc4
+                      f = nc4.File(filename)
+                      self.assertTrue(all(f['test-array'][:] == [1,2,3]))

Contributor

stickler-ci May 30, 2018

E231 missing whitespace after ','

satpy/writers/cf_writer.py Outdated

+                  dtnp64 = dataarray['time'].data[0]
+                  time_bnds = [(np.datetime64(start_time) - dtnp64),
+                               (np.datetime64(end_time) - dtnp64)]
+                  return  xr.DataArray(np.array(time_bnds) / np.timedelta64(1, 's'),

Contributor

stickler-ci May 30, 2018

E271 multiple spaces after keyword
W291 trailing whitespace

satpy/writers/cf_writer.py Outdated

+                               (np.datetime64(end_time) - dtnp64)]
+                  return  xr.DataArray(np.array(time_bnds) / np.timedelta64(1, 's'),
+                                       dims=['time_bnds'], coords={'time_bnds': [0, 1]})

Contributor

stickler-ci May 30, 2018

W293 blank line contains whitespace

satpy/writers/cf_writer.py Outdated

                               datas[new_ds.attrs['name']] = self.da2cf(new_ds,
                                                                        kwargs.get('epoch',
                                                                                   EPOCH))
-                      dataset = xr.Dataset(datas)

Contributor

stickler-ci May 30, 2018

W293 blank line contains whitespace

satpy/writers/cf_writer.py Outdated


		dataset = xr.Dataset(datas)

		dataset = xr.Dataset(datas)

Contributor

stickler-ci May 30, 2018

W291 trailing whitespace

satpy/writers/cf_writer.py Outdated

-                      dataset = xr.Dataset(datas)
+                      dataset = xr.Dataset(datas)
+                      dataset['time_bnds'] = make_time_bounds(dataset,

Contributor

stickler-ci May 30, 2018

W291 trailing whitespace


          Clean up code

779ac61

codecov bot commented May 30, 2018 •

edited

Codecov Report

Merging #307 into master will increase coverage by 1.34%.
The diff coverage is 92.43%.

@@            Coverage Diff             @@
##           master     #307      +/-   ##
==========================================
+ Coverage   65.98%   67.33%   +1.34%     
==========================================
  Files         119      120       +1     
  Lines       14493    15471     +978     
==========================================
+ Hits         9563    10417     +854     
- Misses       4930     5054     +124

Impacted Files	Coverage Δ
satpy/tests/writer_tests/__init__.py	`92.3% <100%> (+0.64%)`	⬆️
satpy/writers/cf_writer.py	`67.18% <80.48%> (+67.18%)`	⬆️
satpy/tests/writer_tests/test_cf.py	`97.82% <98.7%> (+42.82%)`	⬆️
satpy/composites/__init__.py	`32.2% <0%> (-0.73%)`	⬇️
satpy/tests/test_readers.py	`98.09% <0%> (-0.29%)`	⬇️
satpy/tests/reader_tests/test_ahi_hsd.py	`91.89% <0%> (ø)`
satpy/tests/reader_tests/__init__.py	`96.66% <0%> (+0.23%)`	⬆️
satpy/tests/test_writers.py	`97.97% <0%> (+0.49%)`	⬆️
satpy/readers/__init__.py	`95.28% <0%> (+0.52%)`	⬆️
satpy/readers/safe_msi.py	`3.07% <0%> (+0.53%)`	⬆️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 93826db...4047077. Read the comment docs.

mraspaud added 2 commits

May 30, 2018 11:51


          Support arrays without time dimension

a26ef46


          Fix py3 compatibility

016a66e

coveralls commented May 30, 2018 •

edited

Coverage increased (+1.8%) to 67.783% when pulling 4047077 on fix-cf-writer into 93826db on master.

mraspaud added 3 commits

May 30, 2018 22:41


          Factorize cf's save_datasets arguments

a2df54f


          Close nc files in cf tests for appveyor

196c393


          Close testing cf files too

c8767b6

mraspaud added enhancement component:writers labels

mraspaud self-assigned this


          Remove overlay from cf writing

mraspaud merged commit 4f7e597 into master

mraspaud deleted the fix-cf-writer branch

June 11, 2018 06:47

gerritholl reviewed

View reviewed changes

satpy/writers/cf_writer.py

+                                                                  end_times)
+                          dataset['time'].attrs['bounds'] = "time_bnds"
+                      except KeyError:
+                          logger.warning('No time dimension in datasets, skipping time bounds creation.')

Collaborator

gerritholl Nov 4, 2022

Should this be no time coordinate / no time variable? It doesn't seem to be specifically looking for a dimension (and still isn't with the refactoring to how this code is today). I think that having a time dimension is pretty rare in Satpy. The only way I can think of is either from a reader (maybe the GRIB reader?) or from a MultiScene with (mscn.blend(blend_function=timeseries)).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment