From d97df895f9664092c7e5844388dc326676f29839 Mon Sep 17 00:00:00 2001 From: Alexander James Date: Wed, 3 Jul 2024 13:25:33 -0700 Subject: [PATCH 1/2] doc fixes --- pyleoclim/core/ensembleseries.py | 8 ++------ pyleoclim/core/mulensgeoseries.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pyleoclim/core/ensembleseries.py b/pyleoclim/core/ensembleseries.py index 8d4348c0..5058faef 100644 --- 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 index 72437cfa..f5a4ee2f 100644 --- a/pyleoclim/core/mulensgeoseries.py +++ b/pyleoclim/core/mulensgeoseries.py @@ -74,7 +74,7 @@ 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]) From e542b7fe39e417b9051c9e66385de35f8ec27af2 Mon Sep 17 00:00:00 2001 From: Alexander James Date: Wed, 3 Jul 2024 14:51:32 -0700 Subject: [PATCH 2/2] fix mulensgeoseries doc --- pyleoclim/core/mulensgeoseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyleoclim/core/mulensgeoseries.py b/pyleoclim/core/mulensgeoseries.py index f5a4ee2f..3f524d42 100644 --- a/pyleoclim/core/mulensgeoseries.py +++ b/pyleoclim/core/mulensgeoseries.py @@ -77,7 +77,7 @@ def mcpca(self,nsim=1000, seed=None, common_time_kwargs=None, pca_kwargs=None,al 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()