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.

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

Make difference module handle circular cubes #1990

Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
50d08bb
Resolved merge conflict
MO-PeterJordan Apr 22, 2024
e4bce85
Added another failing test for difference module. Differences calcula…
MO-PeterJordan Apr 22, 2024
beabc9e
Resolved merge conflicts
MO-PeterJordan Apr 23, 2024
141ee1f
Auto-formatting
MO-PeterJordan Apr 23, 2024
9535d45
Import Bugfix
MO-PeterJordan Apr 23, 2024
c442023
Ran isort against spatial.py
MO-PeterJordan Apr 23, 2024
62dc4d9
Added test for appropriate error for unhandled cubes and made code ma…
MO-PeterJordan Apr 23, 2024
636ec69
iSort on spatial.py again
MO-PeterJordan Apr 23, 2024
fa2b8b0
Another attempt at autoformatting
MO-PeterJordan Apr 23, 2024
53659a6
Tidied up
MO-PeterJordan Apr 23, 2024
617bd27
Removed confusing variable name
MO-PeterJordan Apr 24, 2024
0910cd6
Autoformatting
MO-PeterJordan Apr 24, 2024
8082dd0
Tried manually sorting import order as isort still failing in github …
MO-PeterJordan Apr 24, 2024
22e920a
And again
MO-PeterJordan Apr 24, 2024
ce71d4c
And again
MO-PeterJordan Apr 24, 2024
b74833b
Linting suggestion
MO-PeterJordan Apr 24, 2024
ccdc67f
Review Actions
MO-PeterJordan May 20, 2024
c51ad05
Ran isort to fix gha
MO-PeterJordan May 23, 2024
8eb9195
Added test for cubes with flipped axes (lonitude increasing along col…
MO-PeterJordan Jun 17, 2024
939ac46
Merge branch 'master' into pjordan-make-difference-module-handle-circ…
MO-PeterJordan Jun 17, 2024
e3496eb
black, isort, flake8
MO-PeterJordan Jun 17, 2024
175e825
Ran isort in isolation
MO-PeterJordan Jun 17, 2024
6fbc3eb
Fixed test failures resulting from breaking changes made by upstream PR
MO-PeterJordan Jun 17, 2024
31fceb3
Black
MO-PeterJordan Jun 17, 2024
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
Prev Previous commit
Next Next commit
Tried manually sorting import order as isort still failing in github …
…actions despite running locally and pushing
  • Loading branch information
MO-PeterJordan committed Apr 24, 2024
commit 8082dd07907904560663581dae79f92907dc2abb
14 changes: 9 additions & 5 deletions improver/utilities/spatial.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@
""" Provides support utilities."""

import copy
from typing import List, Optional, Tuple, Union

import cartopy.crs as ccrs
import iris
import netCDF4
import numpy as np
from iris.coords import AuxCoord, CellMethod, Coord
from iris.cube import Cube, CubeList
from numpy import ndarray
from numpy.ma import MaskedArray
from scipy.ndimage.filters import maximum_filter

import cartopy.crs as ccrs
import iris

from cartopy.crs import CRS
from cf_units import Unit
from improver import BasePlugin, PostProcessingPlugin
Expand All @@ -50,10 +54,10 @@
from improver.metadata.utilities import create_new_diagnostic_cube
from improver.utilities.cube_checker import check_cube_coordinates, spatial_coords_match
from improver.utilities.cube_manipulation import enforce_coordinate_ordering

from iris.coord_systems import GeogCS
from iris.coords import AuxCoord, CellMethod, Coord
from iris.cube import Cube, CubeList
from typing import List, Optional, Tuple, Union




def check_if_grid_is_equal_area(
Expand Down
Loading