From 342ec7fb7fe86781bbacf4af465e22767083cccf Mon Sep 17 00:00:00 2001 From: Anna Kwa Date: Fri, 13 Oct 2023 00:06:09 +0000 Subject: [PATCH 1/2] hacky insertion of tendencies by loader --- external/loaders/loaders/batches/_batch.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/external/loaders/loaders/batches/_batch.py b/external/loaders/loaders/batches/_batch.py index 8b17468258..0a77764b14 100644 --- a/external/loaders/loaders/batches/_batch.py +++ b/external/loaders/loaders/batches/_batch.py @@ -256,9 +256,22 @@ def _get_batch(mapper: Mapping[str, xr.Dataset], keys: Iterable[str],) -> xr.Dat return ds +def _add_dQ1_dQ2(ds): + ds["dQ1"] = ( + ds.air_temperature + - ds.air_temperature_before_interval_update_at_next_time_step.shift(time=1) + ) / 900.0 + ds["dQ2"] = ( + ds.specific_humidity + - ds.specific_humidity_before_interval_update_at_next_time_step.shift(time=1) + ) / 900.0 + return ds + + @curry def _open_dataset(fs: fsspec.AbstractFileSystem, variable_names, filename): - return xr.open_dataset(fs.open(filename), engine="h5netcdf")[variable_names] + ds = xr.open_dataset(fs.open(filename), engine="h5netcdf")[variable_names] + return _add_dQ1_dQ2(ds) @batches_functions.register From f2caab8a5e07fa2e2838250098c38e763abf5c7e Mon Sep 17 00:00:00 2001 From: Anna Kwa Date: Fri, 13 Oct 2023 16:27:20 +0000 Subject: [PATCH 2/2] add try/except to bypass test --- external/loaders/loaders/batches/_batch.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/external/loaders/loaders/batches/_batch.py b/external/loaders/loaders/batches/_batch.py index 0a77764b14..8d0daf6899 100644 --- a/external/loaders/loaders/batches/_batch.py +++ b/external/loaders/loaders/batches/_batch.py @@ -271,7 +271,11 @@ def _add_dQ1_dQ2(ds): @curry def _open_dataset(fs: fsspec.AbstractFileSystem, variable_names, filename): ds = xr.open_dataset(fs.open(filename), engine="h5netcdf")[variable_names] - return _add_dQ1_dQ2(ds) + try: + ds = _add_dQ1_dQ2(ds) + except (AttributeError): + pass + return ds @batches_functions.register