From d89c716e5095c84010df59fa5a688e4155c7d2ad Mon Sep 17 00:00:00 2001 From: justin-richling Date: Thu, 12 Dec 2024 15:22:17 -0700 Subject: [PATCH] Update glob for variables with underscore There was an issue with the wildcard in globbing regridded files that would cause issues if two variable names were similar but one had an underscore, if vpwp_mfl and vpwp. --- lib/adf_dataset.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/adf_dataset.py b/lib/adf_dataset.py index c82b66f2a..071ddc3fe 100644 --- a/lib/adf_dataset.py +++ b/lib/adf_dataset.py @@ -232,9 +232,9 @@ def get_regrid_file(self, case, field): """Return list of test regridded files""" model_rg_loc = Path(self.adf.get_basic_info("cam_regrid_loc", required=True)) rlbl = self.ref_labels[field] # rlbl = "reference label" = the name of the reference data that defines target grid - return sorted(model_rg_loc.glob(f"{rlbl}_{case}_{field}_*.nc")) + return sorted(model_rg_loc.glob(f"{rlbl}_{case}_{field}_regridded.nc")) + - def load_regrid_dataset(self, case, field): """Return a data set to be used as reference (aka baseline) for variable field.""" fils = self.get_regrid_file(case, field) @@ -265,7 +265,7 @@ def get_ref_regrid_file(self, case, field): fils = [] else: model_rg_loc = Path(self.adf.get_basic_info("cam_regrid_loc", required=True)) - fils = sorted(model_rg_loc.glob(f"{case}_{field}_*.nc")) + fils = sorted(model_rg_loc.glob(f"{case}_{field}_baseline.nc")) return fils