Merge remote-tracking branch 'origin/master'

zachbateman · Oct 9, 2019 · 41455e2 · 41455e2
2 parents 872c24a + 1e3d289
commit 41455e2
Show file tree

Hide file tree

Showing 13 changed files with 4,522 additions and 3,187 deletions.
diff --git a/gempy/assets/kriging.py b/gempy/assets/kriging.py
diff --git a/gempy/plot/plot.py b/gempy/plot/plot.py
@@ -205,7 +205,7 @@ def plot_stereonet(geo_data, litho=None, planes=True, poles=True, single_plots=F
 
     Args:
         geo_model (gempy.DataManagement.InputData): Input data of the model
-        series_only: To select whether a stereonet is plotted per series or per formation
+        series_only: To select whether a stereonet is plotted perries or per formation
         litho: selection of formation or series names, as list. If None, all are plotted
         planes: If True, azimuth and dip are plotted as great circles
         poles: If True, pole points (plane normal vectors) of azimuth and dip are plotted

diff --git a/notebooks/experimental/Kriging Test.ipynb b/notebooks/experimental/Kriging Test.ipynb
diff --git a/notebooks/experimental/Kriging example.ipynb b/notebooks/experimental/Kriging example.ipynb
diff --git a/notebooks/experimental/kriging_examples/3D Plotting exampe .ipynb b/notebooks/experimental/kriging_examples/3D Plotting exampe .ipynb
diff --git a/notebooks/experimental/kriging_examples/Comparison GSTools.ipynb b/notebooks/experimental/kriging_examples/Comparison GSTools.ipynb
diff --git a/notebooks/experimental/kriging_examples/Distances tests.ipynb b/notebooks/experimental/kriging_examples/Distances tests.ipynb
diff --git a/notebooks/experimental/kriging_examples/General kriging comparison.ipynb b/notebooks/experimental/kriging_examples/General kriging comparison.ipynb
diff --git a/notebooks/experimental/kriging_examples/Plotting options.ipynb b/notebooks/experimental/kriging_examples/Plotting options.ipynb
diff --git a/notebooks/experimental/kriging_examples/Simple example of kriging - test.ipynb b/notebooks/experimental/kriging_examples/Simple example of kriging - test.ipynb
diff --git a/notebooks/experimental/kriging_examples/The Nugget effect.ipynb b/notebooks/experimental/kriging_examples/The Nugget effect.ipynb
diff --git a/notebooks/experimental/kriging_examples/Variogram testing.ipynb b/notebooks/experimental/kriging_examples/Variogram testing.ipynb
diff --git a/notebooks/tutorials/ch3-1-Kriging_interpolation_and_simulation.ipynb b/notebooks/tutorials/ch3-1-Kriging_interpolation_and_simulation.ipynb