Merge pull request #78 from euro-cordex/drs_format_change_fix

DRS format change fix

Author: larsbuntemeyer

cc_plugin_cc6/base.py

@@ -61,6 +61,11 @@ class MIPCVCheck(BaseNCCheck, MIPCVCheckBase):
     def make_result(cls, level, score, out_of, name, messages):
         return Result(level, (score, out_of), name, messages)
 
+    def __del__(self):
+        xrds = getattr(self, "xrds", None)
+        if xrds is not None and hasattr(xrds, "close"):
+            xrds.close()
+
     def setup(self, dataset):
         # netCDF4.Dataset
         self.dataset = dataset
@@ -620,8 +625,11 @@ def _map_drs_blocks(self):
             drs_filename_template = re.findall(
                 r"<([^<>]*)\>", self.CV["DRS"]["filename_template"]
             )
-            self.drs_suffix = ".".join(
-                self.CV["DRS"]["filename_template"].split(".")[1:]
+            # Fix for new DRS template format
+            if "time_range" not in drs_filename_template:
+                drs_filename_template.append("time_range")
+            self.drs_suffix = (
+                ".".join(self.CV["DRS"]["filename_template"].split(".")[1:]) or "nc"
             )
         except KeyError:
             raise KeyError("The CV does not contain DRS information.")

cc_plugin_cc6/cc6.py

@@ -51,7 +51,18 @@ def setup(self, dataset):
                     CORDEX_CMIP6_CMOR_TABLES_URL + "CORDEX-CMIP6_" + table + ".json",
                     filename,
                     tables_path,
-                    force=self.options.get("force_table_download", False),
+                    force="force_table_download" in self.options
+                    and (
+                        self.options["force_table_download"] is None
+                        or (
+                            isinstance(self.options["force_table_download"], bool)
+                            and self.options["force_table_download"]
+                        )
+                        or (
+                            isinstance(self.options["force_table_download"], str)
+                            and self.options["force_table_download"].lower() != "false"
+                        )
+                    ),
                 )
                 if os.path.basename(os.path.realpath(filename_retrieved)) != filename:
                     raise AssertionError(