Merge pull request #596 from LinkedEarth/mulens_doc_fix

Fix ensembleseries doc build failure
LinkedEarth · Jul 3, 2024 · 98a1566 · 98a1566
2 parents 807652d + e542b7f
commit 98a1566
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/pyleoclim/core/ensembleseries.py b/pyleoclim/core/ensembleseries.py
@@ -219,9 +219,7 @@ def from_PaleoEnsembleArray(self, series, paleo_array, paleo_depth = None, age_d
             #Create a random series
             value = np.random.normal(0,1,length)
             time = pyleo.utils.tsmodel.random_time_axis(length)
-            lat = np.random.randint(-90,90)
-            lon = np.random.randint(-180,180)
-            series = pyleo.Series(time=time, value=value, lat=lat, lon=lon, verbose=False)
+            series = pyleo.Series(time=time, value=value, verbose=False)
 
             #Create an ensemble using these objects
             #Note that the time axis of the series object and the number of rows in the age array must match when depth is not passed
@@ -238,9 +236,7 @@ def from_PaleoEnsembleArray(self, series, paleo_array, paleo_depth = None, age_d
             age_length = 800
             value = np.random.normal(0,1,age_length)
             time = pyleo.utils.tsmodel.random_time_axis(age_length)
-            lat = np.random.randint(-90,90)
-            lon = np.random.randint(-180,180)
-            series = pyleo.Series(time=time, value=value, lat=lat, lon=lon, verbose=False)
+            series = pyleo.Series(time=time, value=value, verbose=False)
             age_depth = np.arange(age_length)
 
             ens = pyleo.EnsembleSeries.from_PaleoEnsembleArray(series = series,paleo_array=paleo_array,paleo_depth=paleo_depth,age_depth=age_depth,verbose=False)

diff --git a/pyleoclim/core/mulensgeoseries.py b/pyleoclim/core/mulensgeoseries.py
@@ -74,10 +74,10 @@ def mcpca(self,nsim=1000, seed=None, common_time_kwargs=None, pca_kwargs=None,al
                     ts = pyleo.GeoSeries(time=signal.time, value=signal.value+noise[:,idx], lat=lat, lon=lon, verbose=False)
                     series_list.append(ts)
 
-                ts_ens = pyleo.EnsembleSeries(series_list)
+                ts_ens = pyleo.EnsembleGeoSeries(series_list)
                 ens_list.append(ts_ens)
 
-            mul_ens = pyleo.MulEnsGeoSeries([ts_ens])
+            mul_ens = pyleo.MulEnsGeoSeries(ens_list)
             mul_ens.mcpca(nsim=10,seed=42)'''
 
         common_time_kwargs = {} if common_time_kwargs is None else common_time_kwargs.copy()