Merge branch 'main' into enso_plots

PCMDI · Dec 4, 2024 · 34c0d64 · 34c0d64
2 parents 8ff5c25 + 0153e3c
commit 34c0d64
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 80 deletions.
diff --git a/pcmdi_metrics/mean_climate/lib/load_and_regrid.py b/pcmdi_metrics/mean_climate/lib/load_and_regrid.py
@@ -80,7 +80,7 @@ def load_and_regrid(
                     '[WARNING]: calendar info not found for time axis. ds.time.attrs["calendar"] is adjusted to standard'
                 )
 
-    # time bound check #1 -- add proper time bound info if cdms-generated annual cycle is loaded
+    # time bound check #1 -- add proper time bound info if non-xcdat-generated annual cycle is loaded
     if isinstance(
         ds.time.values[0], np.float64
     ):  # and "units" not in list(ds.time.attrs.keys()):

diff --git a/pcmdi_metrics/variability_mode/lib/__init__.py b/pcmdi_metrics/variability_mode/lib/__init__.py
@@ -21,7 +21,6 @@
     linear_regression,
     linear_regression_on_globe_for_teleconnection,
 )
-from .landmask import data_land_mask_out, estimate_landmask  # noqa
 from .lib_variability_mode import (  # noqa
     search_paths,
     check_start_end_year,

diff --git a/pcmdi_metrics/variability_mode/lib/landmask.py b/pcmdi_metrics/variability_mode/lib/landmask.py