Merge branch 'main' of https://github.com/seismicreservoirmodeling/Se…

…ReMpy into main
leandrofgr · Mar 23, 2021 · 6c7aaa5 · 6c7aaa5
2 parents 70c97c8 + af1fbaa
commit 6c7aaa5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/GeostatisticsDiscreteDriver.py b/GeostatisticsDiscreteDriver.py
@@ -43,7 +43,7 @@
 plt.show()
 
 # indicator kriging
-ikp, ikmap = IndicatorKriging(xcoords, dcoords, fvalues, nf, pprior, l, krigtype)
+ikp, ikmap = IndicatorKriging(xcoords, dcoords, fvalues, nf, pprior, float(l), krigtype)
 
 
 # simulation

diff --git a/Geostats.py b/Geostats.py
@@ -381,6 +381,10 @@ def SeqGaussianSimulation(xcoords, dcoords, dvalues, xmean, xvar, l, krigtype, k
     pathcoords = nonsimcoords[pathind, :]
     simval = np.zeros((npl, 1))
 
+    # if the xmean is a single value, transform to an array
+    if type(xmean) == float:
+        xmean = xmean*np.ones((n, 1))
+
     # sequential simulation
     for i in range(npl):
         if dcoords.shape[0] < nmax:
@@ -396,7 +400,7 @@ def SeqGaussianSimulation(xcoords, dcoords, dvalues, xmean, xvar, l, krigtype, k
 
         # kriging
         if krig == 0:
-            krigmean, krigvar = SimpleKriging(pathcoords[i,:], dc, dz, xmean, xvar, l, krigtype)
+            krigmean, krigvar = SimpleKriging(pathcoords[i,:], dc, dz, xmean[pathind[i]], xvar, l, krigtype)
         else:
             krigmean, krigvar = OrdinaryKriging(pathcoords[i,:], dc, dz, xvar, l, krigtype)