Merge remote-tracking branch 'origin/development' into development

Author: Alex

gempy/DataManagement.py

@@ -751,10 +751,11 @@ class FoliaitionsFromInterfaces:
     def __init__(self, geo_data, group_id, mode, verbose=False):
         """
 
-        :param geo_data: InputData object
-        :param group_id: (str) identifier for the data group
-        :param mode: (str), either 'interf_to_fol' or 'fol_to_interf'
-        :param verbose: (bool) adjusts verbosity, default False
+        Args:
+            geo_data: InputData object
+            group_id: (str) identifier for the data group
+            mode: (str), either 'interf_to_fol' or 'fol_to_interf'
+            verbose: (bool) adjusts verbosity, default False
         """
         self.geo_data = geo_data
         self.group_id = group_id
@@ -824,7 +825,7 @@ def _fit_plane_svd(self):
         m = np.dot(x, x.T)  # np.cov(x)
         return ctr, svd(m)[0][:, -1]
 
-    def _get_dip(self, verbose=False):
+    def _get_dip(self):
         """Returns dip angle and azimuth of normal vector [x,y,z]."""
         dip = np.arccos(self.normal[2] / np.linalg.norm(self.normal)) / np.pi * 180.
 

gempy/Topology.py

@@ -17,9 +17,16 @@
 
 @author: Alexander Schaaf
 """
-from skimage.future import graph
-from skimage.measure import label
-from skimage.measure import regionprops
+
+import warnings
+try:
+    from skimage.future import graph
+    from skimage.measure import label
+    from skimage.measure import regionprops
+except ImportError:
+    warnings.warn("skimage package is not installed, which is required for geomodel topology analysis.")
+
+
 import numpy as np
 
 

gempy/Visualization.py

@@ -337,13 +337,14 @@ def plot_topo_g(geo_data, G, centroids, direction="y"):
             #     plt.plot(np.array([centroids[a][c1], centroids[b][c1]]) * e1 / r1 + d1,
             #              np.array([centroids[a][c2], centroids[b][c2]]) * e2 / r2 + d2, "black", linewidth=2)
             plt.plot(np.array([centroids[a][c1], centroids[b][c1]]) * e1 / r1 + d1,
-                          np.array([centroids[a][c2], centroids[b][c2]]) * e2 / r2 + d2, "black", linewidth=2)
+                          np.array([centroids[a][c2], centroids[b][c2]]) * e2 / r2 + d2, "black", linewidth=0.75)
 
             for node in G.nodes_iter():
                 plt.plot(centroids[node][c1] * e1 / r1 + d1, centroids[node][c2] * e2 / r2 +d2,
-                         marker="o", color="black", markersize=20)
-                plt.text(centroids[node][c1] * e1 / r1 * 0.99 + d1,
-                         centroids[node][c2] * e2 / r2 * 0.99 + d2, str(node), color="white", size=10)
+                         marker="o", color="black", markersize=10, alpha=0.75)
+                plt.text(centroids[node][c1] * e1 / r1 + d1,
+                         centroids[node][c2] * e2 / r2 + d2, str(node), color="white", size=6, ha="center", va="center",
+                         weight="ultralight", family="monospace")
 
     @staticmethod
     def annotate_plot(frame, label_col, x, y, **kwargs):

gempy/theanograf.py

@@ -31,7 +31,7 @@
 theano.config.openmp_elemwise_minsize = 50000
 theano.config.openmp = True
 
-theano.config.optimizer = 'fast_run'
+theano.config.optimizer = 'fast_compile'
 theano.config.floatX = 'float64'
 
 theano.config.exception_verbosity = 'high'