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

Fix res_grid_deg bug to allow either floats or a dict #1227

Merged
merged 4 commits into from
Jun 26, 2024
Merged

Fix res_grid_deg bug to allow either floats or a dict #1227

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdc1af9
res_grid_deg
lewisblake Jun 26, 2024
9db610c
Introduce and use RegridResDeg typeddict
lewisblake Jun 26, 2024
73512ec
import from typing_extensions
lewisblake Jun 26, 2024
2a575be
don't use isinstace on RegridResDeg
lewisblake Jun 26, 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
11 changes: 7 additions & 4 deletions pyaerocom/colocation/colocation_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,12 @@ class ColocationSetup(BaseModel):
harmonise_units : bool
if True, units are attempted to be harmonised during co-location
(note: raises Exception if True and in case units cannot be harmonised).
regrid_res_deg : int, optional
resolution in degrees for regridding of model grid (done before
co-location). Default is None.
regrid_res_deg : float or dict, optional
regrid resolution in degrees. If specified, the input gridded data
objects will be regridded in lon / lat dimension to the input
resolution (if input is float, both lat and lon are regridded to that
resolution, if input is dict, use keys `lat_res_deg` and `lon_res_deg`
to specify regrid resolutions, respectively). Default is None.
colocate_time : bool
if True and if obs and model sampling frequency (e.g. daily) are higher
than output colocation frequency (e.g. monthly), then the datasets are
Expand Down Expand Up @@ -411,7 +414,7 @@ def validate_basedirs(cls, v):
model_outlier_ranges: dict[str, tuple[float, float]] | None = {}
zeros_to_nan: bool = False
harmonise_units: bool = False
regrid_res_deg: float | None = None
regrid_res_deg: float | dict[Literal["lat_res_deg", "lon_res_deg"], float] | None = None
colocate_time: bool = False
reanalyse_existing: bool = True
raise_exceptions: bool = False
Expand Down