Skip to content

Commit d88cb78

Browse files
authored
Add filenames_template for use in timeseries plots (#253)
## Description Add capability to use filenames_template to timeseries plots. ## Dependencies None ## Impact Changes a test to use timeseries template in place of explicitly using filenames.
1 parent 4c850ca commit d88cb78

2 files changed

Lines changed: 16 additions & 31 deletions

File tree

src/eva/tests/config/testIodaObsSpaceAmsuaN19_Multiple_TimeSeries.yaml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,11 @@ suppress_collection_display: false
22
datasets:
33
- name: control
44
type: IodaObsSpace
5-
filenames:
6-
- ${data_input_path}/ctrl_amsua_n19.20230726T030000Z.nc4
7-
channels: 3,8
8-
groups:
9-
- name: ObsValue
10-
variables:
11-
- brightnessTemperature
12-
- name: GsiHofXBc
13-
- name: hofx0
14-
- name: MetaData
15-
- name: oman
16-
- name: control
17-
type: IodaObsSpace
18-
filenames:
19-
- ${data_input_path}/ctrl_amsua_n19.20230726T090000Z.nc4
20-
channels: 3,8
21-
groups:
22-
- name: ObsValue
23-
variables:
24-
- brightnessTemperature
25-
- name: GsiHofXBc
26-
- name: hofx0
27-
- name: MetaData
28-
- name: oman
29-
- name: experiment
30-
type: IodaObsSpace
31-
filenames:
32-
- ${data_input_path}/exp_amsua_n19.20230726T030000Z.nc4
5+
filenames_template:
6+
template: ${data_input_path}/ctrl_amsua_n19.%Y%m%dT%H0000Z.nc4
7+
start: '2023-07-26T03:00:00'
8+
end: '2023-07-26T09:00:00'
9+
interval_hours: 6
3310
channels: 3,8
3411
groups:
3512
- name: ObsValue
@@ -40,9 +17,12 @@ datasets:
4017
- name: MetaData
4118
- name: oman
4219
- name: experiment
20+
filenames_template:
21+
template: ${data_input_path}/exp_amsua_n19.%Y%m%dT%H0000Z.nc4
22+
start: '2023-07-26T03:00:00'
23+
end: '2023-07-26T09:00:00'
24+
interval_hours: 6
4325
type: IodaObsSpace
44-
filenames:
45-
- ${data_input_path}/exp_amsua_n19.20230726T090000Z.nc4
4626
channels: 3,8
4727
groups:
4828
- name: ObsValue

src/eva/time_series/time_series_utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import xarray as xr
44
from eva.data.data_driver import data_driver
55
from eva.data.data_collections import DataCollections
6-
6+
from eva.utilities.utils import generate_filenames_from_template
77

88
filename_retrieval = {
99
"GsiObsSpace": lambda dataset_config: dataset_config["filenames"],
@@ -15,6 +15,11 @@
1515
def get_filenames(dataset_config, logger):
1616
""" Retrieve filenames using given type """
1717

18+
if "filenames_template" in dataset_config:
19+
dataset_config['filenames'] = generate_filenames_from_template(
20+
dataset_config['filenames_template'], logger)
21+
del dataset_config['filenames_template']
22+
1823
dataset_type = dataset_config["type"]
1924
logger.assert_abort(dataset_type in filename_retrieval,
2025
f'Unknown dataset_type {dataset_type}')

0 commit comments

Comments
 (0)