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

Refactor CubeCombiner #1383

Merged
merged 10 commits into from
Dec 16, 2020
Merged

Refactor CubeCombiner #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
206e5ae
Factored multiplication case out of CubeCombiner. All CLI tests pass…
cgsandford Dec 3, 2020
f752730
Split existing unit tests between plugins and they pass.
cgsandford Dec 3, 2020
b5adaed
Reduced "broadcast_to_coords" to "broadcast_to_threshold" boolean, co…
cgsandford Dec 3, 2020
ad7611e
Simplified setting up of coords for broadcast to use threshold only.
cgsandford Dec 3, 2020
a038f96
Factored out broadcasting into CubeMultiplier. Coord checking needs …
cgsandford Dec 4, 2020
dec97f8
Removed unused method.
cgsandford Dec 4, 2020
4adf926
Pythonified coordinate checking.
cgsandford Dec 4, 2020
6452ff5
Removed "self.operation" and summarised use more clearly.
cgsandford Dec 4, 2020
c85478c
Addressed comments from first review.
cgsandford Dec 8, 2020
e6c68a7
Response to second review.
cgsandford Dec 15, 2020
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
19 changes: 11 additions & 8 deletions improver/cli/combine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,22 @@ def process(
result (iris.cube.Cube):
Returns a cube with the combined data.
"""
from improver.cube_combiner import CubeCombiner
from improver.cube_combiner import CubeCombiner, CubeMultiplier
from iris.cube import CubeList

if not cubes:
raise TypeError("A cube is needed to be combined.")
if new_name is None:
new_name = cubes[0].name()
broadcast_to_coords = ["threshold"] if broadcast_to_threshold else None
result = CubeCombiner(operation, warnings_on=check_metadata)(
CubeList(cubes),
new_name,
broadcast_to_coords=broadcast_to_coords,
use_midpoint=use_midpoint,
)

if operation == "*" or operation == "multiply":
result = CubeMultiplier()(
CubeList(cubes), new_name, broadcast_to_threshold=broadcast_to_threshold,
)

else:
result = CubeCombiner(operation)(
CubeList(cubes), new_name, use_midpoint=use_midpoint,
)

return result
Loading