Merge branch 'main' into mean_clim_upgrade_lee1043_20240812

PCMDI · Jan 7, 2025 · ab87486 · ab87486
2 parents 8e72c50 + 9bdd219
commit ab87486
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pcmdi_metrics/enso/enso_driver.py b/pcmdi_metrics/enso/enso_driver.py
@@ -99,7 +99,7 @@
 )
 netcdf_path = outdir(output_type="diagnostic_results")
 fig_path = outdir(output_type="graphics")
-json_path = outdir(output_type="metrics")
+json_path = outdir(output_type="metrics_results")
 json_name_template = param.process_templated_argument("json_name")
 netcdf_name_template = param.process_templated_argument("netcdf_name")
 
@@ -630,7 +630,7 @@
             print("metrics:", metrics)
 
             filename_js = OSpath__join(
-                outdir(output_type="diagnostics"), json_name + ".json"
+                outdir(output_type="metrics_results"), json_name + ".json"
             )
             print("filename_js:", filename_js)
             # data_json = dict_metric

diff --git a/pcmdi_metrics/io/xcdat_openxml.py b/pcmdi_metrics/io/xcdat_openxml.py
@@ -11,7 +11,10 @@
 
 
 def xcdat_open(
-    infile: Union[str, list], data_var: str = None, decode_times: bool = True, chunks={}
+    infile: Union[str, list],
+    data_var: str = None,
+    decode_times: bool = True,
+    chunks=None,
 ) -> xr.Dataset:
     """
     Open input file (netCDF, or xml generated by cdscan)

diff --git a/pcmdi_metrics/variability_mode/lib/lib_variability_mode.py b/pcmdi_metrics/variability_mode/lib/lib_variability_mode.py
@@ -94,7 +94,7 @@ def read_data_in(
     debug: bool = False,
 ) -> xr.Dataset:
     # Open data file
-    ds = xcdat_open(path)
+    ds = xcdat_open(path, chunks=None)
 
     # Data QC check -- time axis check
     check_monthly_time_axis(ds)