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

Fix defaults for t1-t0 #43

Merged
merged 12 commits into from
Jun 9, 2023
Merged

Fix defaults for t1-t0 #43

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6374913
change mlp settings
JoranAngevaare Jun 9, 2023
f2f2572
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 9, 2023
5319655
remove imports
JoranAngevaare Jun 9, 2023
1ec92b8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 9, 2023
9beb024
improve imports
JoranAngevaare Jun 9, 2023
fd5e835
Merge branch 'refactor_mlp' of github.com:JoranAngevaare/OptimESMPlay…
JoranAngevaare Jun 9, 2023
fcd32dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 9, 2023
e03e56b
better?
JoranAngevaare Jun 9, 2023
d9f459d
bworks better?
JoranAngevaare Jun 9, 2023
11ab195
remove faulty test
JoranAngevaare Jun 9, 2023
26d9ac8
fix defaults
JoranAngevaare Jun 9, 2023
77f950f
Merge branch 'master' into fix_defaults
JoranAngevaare Jun 9, 2023
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
10 changes: 6 additions & 4 deletions optim_esm_tools/analyze/cmip_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

_seconds_to_year = 365.25 * 24 * 3600
folder_fmt = 'model_group model scenario run domain variable grid version'.split()
__OPTIM_VERSION__ = '0.1.9'
__OPTIM_VERSION__ = '0.1.10'


def _native_date_fmt(time_array: np.array, date: ty.Tuple[int, int, int]):
Expand Down Expand Up @@ -261,8 +261,8 @@ def running_mean_diff(
rename_to: str = 'long_name',
unit: str = 'absolute',
apply_abs: bool = True,
_t_0_date: ty.Optional[tuple] = (2015, 1, 1),
_t_1_date: ty.Optional[tuple] = (2100, 1, 1),
_t_0_date: ty.Optional[tuple] = None,
_t_1_date: ty.Optional[tuple] = None,
) -> xr.Dataset:
"""Return difference in running mean of data set

Expand Down Expand Up @@ -600,7 +600,9 @@ def time_series(self, variable='tas', running_mean=10):

time = 'time'
time_rm = time
ds = self.data_set.mean(dim=['x', 'y'])
ds = self.data_set.copy()
if all(xy in ds.dims for xy in 'xy'):
ds = ds.mean(dim=['x', 'y'])
plot_kw = dict(drawstyle='steps-mid')

_, axes = plt.subplots(3, 1, figsize=(12, 10), gridspec_kw=dict(hspace=0.3))
Expand Down