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

Model level constraint operator #272

Merged
merged 20 commits into from
Nov 23, 2023
Merged

Model level constraint operator #272

merged 20 commits into from
Nov 23, 2023

Conversation

Sylviabohnenstengel
Copy link
Contributor

with constraining by model level and adding recipe for mean model level air temperature.

@Sylviabohnenstengel
extendign constraints operator with constraining by model level and a…
6d3ce6a 
…dding recipe for mean model level air temperature.
@Sylviabohnenstengel Sylviabohnenstengel linked an issue Nov 20, 2023 that may be closed by this pull request
Extent CSET operator constraint: model level #271
Closed
@jfrost-mo jfrost-mo changed the title extendign constraints operator Model level constraint operator Nov 21, 2023
jfrost-mo
jfrost-mo requested changes Nov 21, 2023
View reviewed changes
Copy link
Member

@jfrost-mo jfrost-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested to name everything consistently to model_level_number, fixed the tests, and added some additional logic to handle numbers that should be strings.

src/CSET/operators/constraints.py Outdated Show resolved Hide resolved
src/CSET/operators/constraints.py Outdated Show resolved Hide resolved
src/CSET/operators/constraints.py Show resolved Hide resolved
src/CSET/operators/constraints.py Outdated Show resolved Hide resolved
src/CSET/operators/constraints.py Outdated Show resolved Hide resolved
src/CSET/recipes/extract_instant_model_level_air_temp.yaml Outdated Show resolved Hide resolved
src/CSET/recipes/extract_instant_model_level_air_temp.yaml Outdated Show resolved Hide resolved
src/CSET/recipes/extract_instant_model_level_air_temp.yaml Outdated Show resolved Hide resolved
tests/operators/test_constraints.py Show resolved Hide resolved
tests/operators/test_constraints.py Outdated Show resolved Hide resolved
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/operators/constraints.py
822d2b6 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/operators/constraints.py
4611ebe 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/operators/constraints.py
ccbb6fe 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/operators/constraints.py
7b160e2 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/operators/constraints.py
4322c40 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel
addressing review suggestions.
83cf52f
@Sylviabohnenstengel
Merge branch '271-extent-cset-operator-constraint-model-level' of git…
ef7aac6 
…hub.com:MetOffice/CSET into 271-extent-cset-operator-constraint-model-level
@Sylviabohnenstengel @jfrost-mo
Update tests/operators/test_constraints.py
6cfc64e 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/recipes/extract_instant_model_level_air_temp.yaml
d640abe 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update tests/operators/test_constraints.py
ec4b7de 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel @jfrost-mo
Update src/CSET/recipes/extract_instant_model_level_air_temp.yaml
3e791f2 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
@Sylviabohnenstengel
adding review changes.
c247007
@Sylviabohnenstengel
Merge branch '271-extent-cset-operator-constraint-model-level' of git…
fb3151c 
…hub.com:MetOffice/CSET into 271-extent-cset-operator-constraint-model-level
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 21, 2023 •
edited

Coverage

@Sylviabohnenstengel
Copy link
Contributor Author

had to do a few changes locally and as result merge with outdated changes on the repository. So hopefully this has worked. Thanks for review :-)

jfrost-mo
jfrost-mo requested changes Nov 21, 2023
View reviewed changes
Copy link
Member

@jfrost-mo jfrost-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just need to delete the extract_instant_model_level_air_temp.yaml file. I'll go ahead and do it myself.

src/CSET/recipes/extract_instant_model_level_air_temp.yaml Outdated Show resolved Hide resolved
jfrost-mo
jfrost-mo approved these changes Nov 21, 2023
View reviewed changes
Copy link
Member

@jfrost-mo jfrost-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks go to me. I'll go ahead and merge it once the tests pass.

@Sylviabohnenstengel Sylviabohnenstengel force-pushed the 271-extent-cset-operator-constraint-model-level branch from 173efb0 to b935f48 Compare November 21, 2023 18:17
jfrost-mo
jfrost-mo requested changes Nov 21, 2023
View reviewed changes
tests/operators/test_constraints.py Outdated Show resolved Hide resolved
@Sylviabohnenstengel @jfrost-mo
Update tests/operators/test_constraints.py
e6f803f 
Co-authored-by: James Frost <james.frost@metoffice.gov.uk>
jfrost-mo
jfrost-mo requested changes Nov 23, 2023
View reviewed changes
Copy link
Member

@jfrost-mo jfrost-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor change. I'll commit it and approve.

src/CSET/operators/constraints.py Outdated Show resolved Hide resolved
jfrost-mo
jfrost-mo approved these changes Nov 23, 2023
View reviewed changes
Copy link
Member

@jfrost-mo jfrost-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. I'll go ahead and merge it once the tests have run.

@jfrost-mo
Copy link
Member

Oops, looks like that was python 3.10 syntax.

@jfrost-mo jfrost-mo merged commit b9a2133 into main Nov 23, 2023
5 checks passed
@jfrost-mo jfrost-mo deleted the 271-extent-cset-operator-constraint-model-level branch November 23, 2023 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jfrost-mo jfrost-mo jfrost-mo approved these changes

Assignees

@Sylviabohnenstengel Sylviabohnenstengel

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Extent CSET operator constraint: model level
2 participants
@Sylviabohnenstengel @jfrost-mo