From 2933667a18eb1b25aa8a3301b26c6bd52eb91849 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Wed, 24 May 2023 10:56:09 -0700 Subject: [PATCH 1/2] open xml from pmp workflow and allow wild card usage --- pcmdi_metrics/io/xcdat_openxml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcmdi_metrics/io/xcdat_openxml.py b/pcmdi_metrics/io/xcdat_openxml.py index 0135481c0..5523c2daa 100644 --- a/pcmdi_metrics/io/xcdat_openxml.py +++ b/pcmdi_metrics/io/xcdat_openxml.py @@ -27,7 +27,7 @@ def xcdat_open(infile, data_var=None, decode_times=True): if infile.split('.')[-1].lower() == 'xml': ds = xcdat_openxml(infile, data_var=data_var, decode_times=decode_times) else: - ds = xcdat.open_dataset(infile, data_var=data_var, decode_times=decode_times) + ds = xcdat.open_mfdataset(infile, data_var=data_var, decode_times=decode_times) return ds From 95140e9fa7e667954bb9c3a0798d10c1f72a49ea Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Wed, 24 May 2023 10:59:19 -0700 Subject: [PATCH 2/2] Update xcdat_openxml.py --- pcmdi_metrics/io/xcdat_openxml.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pcmdi_metrics/io/xcdat_openxml.py b/pcmdi_metrics/io/xcdat_openxml.py index 5523c2daa..4dfc451f9 100644 --- a/pcmdi_metrics/io/xcdat_openxml.py +++ b/pcmdi_metrics/io/xcdat_openxml.py @@ -53,10 +53,6 @@ def xcdat_openxml(xmlfile, data_var=None, decode_times=True): doc = xmltodict.parse(fd.read()) ncfile_list = glob.glob(os.path.join(doc['dataset']['@directory'], '*.nc')) - - if len(ncfile_list) > 1: - ds = xcdat.open_mfdataset(ncfile_list, data_var=data_var, decode_times=decode_times) - else: - ds = xcdat.open_dataset(ncfile_list[0], data_var=data_var, decode_times=decode_times) + ds = xcdat.open_mfdataset(ncfile_list, data_var=data_var, decode_times=decode_times) return ds