Merge branch 'master_elisa' of https://github.com/cgre-aachen/gempy i…

…nto hmc_dev # Conflicts: # gempy/plot/plot.py
zachbateman · Sep 10, 2019 · 0177020 · 0177020
2 parents 6a3ff94 + 46c21ee
commit 0177020
Show file tree

Hide file tree

Showing 3 changed files with 472 additions and 138 deletions.
diff --git a/gempy/plot/plot.py b/gempy/plot/plot.py
@@ -319,7 +319,7 @@ def plot_section(model, cell_number=13, block=None, direction="y", interpolation
 
 
 def plot_scalar_field(model, cell_number, N=20,
-                      direction="y", block=None, show_data=True,
+                      direction="y", block=None, alpha=0.6, show_data=True,
                       show_all_data=False, series=0, *args, **kwargs):
     """
     Plot a potential field in a given direction.
@@ -343,7 +343,7 @@ def plot_scalar_field(model, cell_number, N=20,
 
     plot.plot_scalar_field(block, cell_number, N=N,
                            direction=direction, show_data=show_data,
-                           series=series, show_all_data=show_all_data,
+                           series=series, alpha=alpha, show_all_data=show_all_data,
                            *args, **kwargs)
 
 def plot_section_scalarfield(model, section_name, sn, levels=50, show_faults=True, show_topo=True, lithback=True):

diff --git a/gempy/plot/visualization_2d.py b/gempy/plot/visualization_2d.py
@@ -816,7 +816,7 @@ def plot_block_section(self, solution:Solution, cell_number:int, block:np.ndarra
         return plt.gcf()
 
     def plot_scalar_field(self, solution, cell_number, series=0, N=20, block=None,
-                          direction="y", show_data=True, show_all_data=False,
+                          direction="y", alpha=0.6, show_data=True, show_all_data=False,
                           *args, **kwargs):
         """
         Plot a scalar field in a given direction.
@@ -861,7 +861,7 @@ def plot_scalar_field(self, solution, cell_number, series=0, N=20, block=None,
         plt.contourf(scalar_field.reshape(
             self.model.grid.regular_grid.resolution[0], self.model.grid.regular_grid.resolution[1], self.model.grid.regular_grid.resolution[2])[_a, _b, _c].T,
                     N,
-                    extent=extent_val, alpha=0.6, *args,
+                    extent=extent_val, alpha=alpha, *args,
                     **kwargs)
 
         if 'colorbar' in kwargs: