Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
climix
climix
Commits
5aa5301e
Commit
5aa5301e
authored
Jul 15, 2021
by
Klaus Zimmermann
Browse files
Update iris (closes #217)
parent
e9db9bd1
Changes
4
Hide whitespace changes
Inline
Side-by-side
climix/datahandling.py
View file @
5aa5301e
...
...
@@ -4,7 +4,7 @@ import logging
import
time
import
iris
from
iris.
experimental.equalise_cubes
import
equalise_attributes
from
iris.
util
import
equalise_attributes
import
netCDF4
import
numpy
as
np
...
...
climix/iris.py
View file @
5aa5301e
...
...
@@ -21,7 +21,7 @@ def multicube_aggregated_by(cubes, coords, aggregator, **kwargs):
ref_cube
=
next
(
iter
(
cubes
.
values
()))
coords
=
ref_cube
.
_as_list_of_coords
(
coords
)
for
coord
in
sorted
(
coords
,
key
=
lambda
coord
:
coord
.
_as_defn
()
):
for
coord
in
sorted
(
coords
,
key
=
lambda
coord
:
coord
.
metadata
):
if
coord
.
ndim
>
1
:
msg
=
(
"Cannot aggregate_by coord %s as it is "
...
...
@@ -142,7 +142,7 @@ def multicube_aggregated_by(cubes, coords, aggregator, **kwargs):
for
coord
in
groupby
.
coords
:
if
(
dim_coord
is
not
None
and
dim_coord
.
_as_defn
()
==
coord
.
_as_defn
()
and
dim_coord
.
metadata
==
coord
.
metadata
and
isinstance
(
coord
,
iris
.
coords
.
DimCoord
)
):
aggregateby_cube
.
add_dim_coord
(
...
...
environment.yml
View file @
5aa5301e
...
...
@@ -5,5 +5,5 @@ channels:
-
conda-forge
dependencies
:
-
iris>=
2.2.0
,<
3
-
iris>=
3.0.2
,<
4
-
numba
setup.py
View file @
5aa5301e
...
...
@@ -41,7 +41,7 @@ setuptools.setup(
'PyYAML'
,
'regex'
,
'sentry-sdk'
,
'scitools-iris>=
2.2.0
,<
3
'
,
'scitools-iris>=
3
,<
4
'
,
'sparse'
,
],
entry_points
=
{
...
...
Write
Preview
Supports
Markdown
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