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

Use native iris functions in multi-model statistics #1150

Merged
merged 11 commits into from
Jun 7, 2021
Merged

Use native iris functions in multi-model statistics #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9811ebe
Branch off lazy mmstats PR
Peter9192 May 28, 2021
81032a7
Remove code related to lazy evaluation
Peter9192 May 28, 2021
0f47ed6
Turn off tests for lazy data
Peter9192 May 28, 2021
2e214bf
Enforce dtype float32 in test cubes
Peter9192 May 28, 2021
a5e0e9f
Fix dtype issue
Peter9192 May 28, 2021
223acd7
Better note on dtype fix
Peter9192 May 28, 2021
b1b1248
improve warning about std_dev
Peter9192 Jun 7, 2021
6bfc754
Catch errors in cube alignment with nice error message
Peter9192 Jun 7, 2021
58bd700
Catch concat errors in compute_eager
Peter9192 Jun 7, 2021
a0a4d1f
Remove doc statement about lazy evaluation
Peter9192 Jun 7, 2021
68a53b6
Regenerate sample data for failing regression tests
Peter9192 Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions esmvalcore/_recipe_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import yamale

from ._data_finder import get_start_end_year
from .preprocessor import PreprocessingTask, TIME_PREPROCESSORS
from .preprocessor import TIME_PREPROCESSORS, PreprocessingTask
from .preprocessor._multimodel import STATISTIC_MAPPING

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -191,7 +192,7 @@ def extract_shape(settings):

def valid_multimodel_statistic(statistic):
"""Check that `statistic` is a valid argument for multimodel stats."""
valid_names = ["mean", "median", "std", "min", "max"]
valid_names = ['std'] + list(STATISTIC_MAPPING.keys())
valid_patterns = [r"^(p\d{1,2})(\.\d*)?$"]
if not (statistic in valid_names
or re.match(r'|'.join(valid_patterns), statistic)):
Expand Down
Loading