Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
cerbere
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cerbere
cerbere
Commits
f879b53c
Commit
f879b53c
authored
Feb 15, 2020
by
Jeff Piollé
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hide_xarray' of
https://git.cersat.fr/cerbere/cerbere
into hide_xarray
parents
7245a99b
c9779eb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
25 deletions
+24
-25
dataset.py
cerbere/dataset/dataset.py
+5
-7
feature.py
cerbere/feature/feature.py
+19
-0
grid.py
cerbere/feature/grid.py
+0
-18
No files found.
cerbere/dataset/dataset.py
View file @
f879b53c
...
...
@@ -774,10 +774,11 @@ class Dataset(ABC):
storage type.
"""
if
isinstance
(
self
.
dataset
,
Dataset
):
return
self
.
dataset
.
get_values
(
fieldname
,
index
=
index
,
as_masked_array
=
as_masked_array
,
expand
=
expand
,
expand_dims
=
expand_dims
,
**
kwargs
)
kwargs
[
'expand'
]
=
expand
kwargs
[
'expand_dims'
]
=
expand_dims
return
self
.
dataset
.
get_values
(
fieldname
,
index
=
index
,
as_masked_array
=
as_masked_array
,
**
kwargs
)
# ignore indices not applicable to the field
reduced_index
=
None
...
...
@@ -798,9 +799,6 @@ class Dataset(ABC):
# expand over requested dimensions
if
expand
and
expand_dims
is
not
None
:
# retrieve the dimensions to expand over
expand_dims
=
self
.
_feature_geodimnames
fdims
=
self
.
get_field_dimnames
(
fieldname
)
for
dim
in
expand_dims
[::
-
1
]:
if
dim
in
fdims
:
...
...
cerbere/feature/feature.py
View file @
f879b53c
...
...
@@ -427,6 +427,25 @@ class Feature(Dataset):
for
fieldname
,
field
in
child_fields
.
items
():
self
.
add_field
(
field
)
def
get_values
(
self
,
fieldname
,
**
kwargs
):
"""
Args:
expand (bool): expand the geocoordinate values to the full data
grid. This is only for lat, lon and times in the cases for
instance of cylindrical grids (where lat, lon are provided as
vectors) or average/climatological products (where time is
given as a single value for the whole grid). This returns a lat,
lon or times value for each grid pixel.
For more details on the other arguments, refer to:
:func:`cerbere.dataset.Dataset.get_values`
"""
if
'expand_dims'
not
in
kwargs
:
kwargs
[
'expand_dims'
]
=
self
.
_feature_geodimnames
return
super
(
Feature
,
self
)
.
get_values
(
fieldname
,
**
kwargs
)
def
get_times
(
self
,
**
kwargs
):
"""Return the times of a feature.
...
...
cerbere/feature/grid.py
View file @
f879b53c
...
...
@@ -117,24 +117,6 @@ class Grid(Feature):
else
:
return
(
'y'
,
'x'
,)
def
get_values
(
self
,
fieldname
,
**
kwargs
):
"""
Args:
expand (bool): expand the geocoordinate values to the full data
grid. This is only for lat, lon and times in the cases for
instance of cylindrical grids (where lat, lon are provided as
vectors) or average/climatological products (where time is
given as a single value for the whole grid). This returns a lat,
lon or times value for each grid pixel.
For more details on the other arguments, refer to:
:func:`cerbere.dataset.Dataset.get_values`
"""
if
'expand_dims'
not
in
kwargs
:
kwargs
[
'expand_dims'
]
=
self
.
_feature_geodimnames
return
super
(
Grid
,
self
)
.
get_values
(
fieldname
,
**
kwargs
)
# def save(self, output, attrs=None, infer_cf_attrs=False, **kwargs):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment