Merge branch 'master' into depth_nans

LinkedEarth · Jun 19, 2024 · e6f8ca8 · e6f8ca8
2 parents 4d73e94 + 3080ce3
commit e6f8ca8
Show file tree

Hide file tree

Showing 18 changed files with 1,417 additions and 144 deletions.
diff --git a/pyleoclim/core/__init__.py b/pyleoclim/core/__init__.py
@@ -12,8 +12,7 @@
 from .surrogateseries import SurrogateSeries
 from .ensembleseries import EnsembleSeries
 from .scalograms import Scalogram, MultipleScalogram
-from .coherence import Coherence
-from .globalcoherence import GlobalCoherence
+from .coherences import Coherence, GlobalCoherence
 from .corr import Corr
 from .correns import CorrEns
 from .multivardecomp import MultivariateDecomp

diff --git a/pyleoclim/core/coherence.py b/pyleoclim/core/coherence.py
@@ -13,7 +13,7 @@
 from copy import deepcopy
 
 from matplotlib.ticker import ScalarFormatter, FormatStrFormatter
-from matplotlib import cm
+#from matplotlib import cm
 from matplotlib import gridspec
 
 from tqdm import tqdm