From 7c9090c18fc2e6b9204d496b7037f9444e97b177 Mon Sep 17 00:00:00 2001 From: karpob Date: Wed, 11 Feb 2026 17:18:45 -0500 Subject: [PATCH 1/5] add ability to use template for timeseries. --- src/eva/time_series/time_series_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/eva/time_series/time_series_utils.py b/src/eva/time_series/time_series_utils.py index 07d1b59b..f7d46235 100644 --- a/src/eva/time_series/time_series_utils.py +++ b/src/eva/time_series/time_series_utils.py @@ -3,7 +3,7 @@ import xarray as xr from eva.data.data_driver import data_driver from eva.data.data_collections import DataCollections - +from eva.utilities.utils import generate_filenames_from_template filename_retrieval = { "GsiObsSpace": lambda dataset_config: dataset_config["filenames"], @@ -15,6 +15,12 @@ def get_filenames(dataset_config, logger): """ Retrieve filenames using given type """ + if "filenames_template" in dataset_config: + dataset_config['filenames'] = generate_filenames_from_template( + dataset_config['filenames_template'], logger) + del dataset_config['filenames_template'] + + dataset_type = dataset_config["type"] logger.assert_abort(dataset_type in filename_retrieval, f'Unknown dataset_type {dataset_type}') From f7c64f2d62853766efd28aeffd8f41eaadfa4876 Mon Sep 17 00:00:00 2001 From: "Bryan M. Karpowicz" Date: Thu, 12 Feb 2026 14:21:50 -0500 Subject: [PATCH 2/5] apply filenames_template to timeseries test. --- ...aObsSpaceAmsuaN19_Multiple_TimeSeries.yaml | 42 +++++-------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml index 5f78aa56..c2531e50 100644 --- a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml +++ b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml @@ -2,34 +2,11 @@ suppress_collection_display: false datasets: - name: control type: IodaObsSpace - filenames: - - ${data_input_path}/ctrl_amsua_n19.20230726T030000Z.nc4 - channels: 3,8 - groups: - - name: ObsValue - variables: - - brightnessTemperature - - name: GsiHofXBc - - name: hofx0 - - name: MetaData - - name: oman -- name: control - type: IodaObsSpace - filenames: - - ${data_input_path}/ctrl_amsua_n19.20230726T090000Z.nc4 - channels: 3,8 - groups: - - name: ObsValue - variables: - - brightnessTemperature - - name: GsiHofXBc - - name: hofx0 - - name: MetaData - - name: oman -- name: experiment - type: IodaObsSpace - filenames: - - ${data_input_path}/exp_amsua_n19.20230726T030000Z.nc4 + filenames_template: + template: ${data_input_path}/ctrl_amsua_n19.%Y%m%dT%H0000Z.nc4 + start: '2023-07-26T03:00:00' + end: '2023-07-26T09:00:00' + interval_hours: 6 channels: 3,8 groups: - name: ObsValue @@ -40,9 +17,12 @@ datasets: - name: MetaData - name: oman - name: experiment + filenames_template: + template: ${data_input_path}/exp_amsua_n19.%Y%m%dT%H0000Z.nc4 + start: '2023-07-26T03:00:00' + end: '2023-07-26T09:00:00' + interval_hours: 6 type: IodaObsSpace - filenames: - - ${data_input_path}/exp_amsua_n19.20230726T090000Z.nc4 channels: 3,8 groups: - name: ObsValue @@ -91,7 +71,7 @@ graphics: - 1 - 1 title: Mean OmB | AMSU-A NOAA-19 | Ch 3 | ObsValueMinusHofx::brightnessTemperature - output name: time_series/amsua_n19/brightnessTemperature_mean/3/time_series_compare_omb.png + output name: time_series/amsua_n19/brightnessTemperature_mean/3/time_series_compare_omb_template.png plots: - add_xlabel: Datetime add_ylabel: JEDI h(x) From 9da0a852298ea25ef59dea3c284980c74c65d84e Mon Sep 17 00:00:00 2001 From: "Bryan M. Karpowicz" Date: Thu, 12 Feb 2026 14:24:55 -0500 Subject: [PATCH 3/5] fix output filename --- .../config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml index c2531e50..0bef3a43 100644 --- a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml +++ b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml @@ -71,7 +71,7 @@ graphics: - 1 - 1 title: Mean OmB | AMSU-A NOAA-19 | Ch 3 | ObsValueMinusHofx::brightnessTemperature - output name: time_series/amsua_n19/brightnessTemperature_mean/3/time_series_compare_omb_template.png + output name: time_series/amsua_n19/brightnessTemperature_mean/3/time_series_compare_omb.png plots: - add_xlabel: Datetime add_ylabel: JEDI h(x) From 4787d8c420d515260f77714388432e91b9b90394 Mon Sep 17 00:00:00 2001 From: "Bryan M. Karpowicz" Date: Thu, 12 Feb 2026 14:34:20 -0500 Subject: [PATCH 4/5] fix code style. --- src/eva/time_series/time_series_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/eva/time_series/time_series_utils.py b/src/eva/time_series/time_series_utils.py index f7d46235..5fc8550f 100644 --- a/src/eva/time_series/time_series_utils.py +++ b/src/eva/time_series/time_series_utils.py @@ -20,7 +20,6 @@ def get_filenames(dataset_config, logger): dataset_config['filenames_template'], logger) del dataset_config['filenames_template'] - dataset_type = dataset_config["type"] logger.assert_abort(dataset_type in filename_retrieval, f'Unknown dataset_type {dataset_type}') From 38e3e8de6880108478b54ec62c8f950dc1ddc48b Mon Sep 17 00:00:00 2001 From: "Bryan M. Karpowicz" Date: Thu, 12 Feb 2026 14:36:37 -0500 Subject: [PATCH 5/5] fix yaml norms. --- .../config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml index 0bef3a43..96461d4a 100644 --- a/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml +++ b/src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml @@ -17,7 +17,7 @@ datasets: - name: MetaData - name: oman - name: experiment - filenames_template: + filenames_template: template: ${data_input_path}/exp_amsua_n19.%Y%m%dT%H0000Z.nc4 start: '2023-07-26T03:00:00' end: '2023-07-26T09:00:00'