Skip to content

Commit

Permalink
Merge pull request #155 from sami2py/jklenzing-patch-1
Browse files Browse the repository at this point in the history
BUG/MAINT: xarray compatibility, update minimum numpy to 1.18
  • Loading branch information
jklenzing committed Aug 13, 2021
2 parents abad127 + e9f6e62 commit e4455f9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os: [ubuntu-latest, windows-latest]
include:
- python-version: 3.7
numpy_ver: 1.17
numpy_ver: 1.18
os: ubuntu-latest

name: Python ${{ matrix.python-version }} on ${{ matrix.os }} with numpy ${{ matrix.numpy_ver }}
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.2.5] - 2021-08-13
- Add basic metadata for ExB Fourier Coefficients
- Fixed a bug with xarray 0.19.0
- Update NEP-29 minimum version to numpy 1.18

## [0.2.4] - 2021-06-23
- Updated the unit attributes to consistently use 'hrs' instead of 'hours'.

Expand Down
4 changes: 3 additions & 1 deletion sami2py/_core_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ def _load_model(self):
if self.MetaData['ExB model'] == 'Fourier Series':
exb = return_fourier(self.data['slt'],
self.MetaData['Fourier Coeffs'])
self.data['exb'] = (('ut'), exb)
self.data['exb'] = (('ut'), exb.data,
{'units': 'm/s',
'long_name': 'ExB Foureir Coefficients'})

def _generate_metadata(self, namelist):
"""Reads the namelist and generates MetaData based on Parameters
Expand Down

0 comments on commit e4455f9

Please sign in to comment.