- [BUG] Update xsolution.py to match subsurface v0.2 properly

Author: Leguark

.travis.yml

@@ -56,7 +56,7 @@ install:
   - pip install git+https://github.com/arviz-devs/arviz --force-reinstall
 
   # Install subsurface
-  - pip install subsurface==0.2
+  - pip install subsurface
 
   - conda install -c conda-forge gdal
 

gempy/core/xsolution.py

@@ -231,35 +231,35 @@ def create_unstruct_xarray(values, l0, l1, xyz):
             # Values and lith block
             property_v3 = xr.DataArray(
                 data=values[0][:, l0:l1],
-                dims=['attribute', 'cell'],
+                dims=['cell_attr', 'cell'],
             )
 
-            arrays['property_v3'] = property_v3
+            arrays['property'] = property_v3
 
         if values[1] is not None:
             # block
             block_v3 = xr.DataArray(
                 data=values[1][:, :, l0:l1],
-                dims=['Features', 'attribute', 'cell'],
+                dims=['Features', 'cell_attr', 'cell'],
             )
 
-            arrays['block_v3'] = block_v3
+            arrays['block'] = block_v3
 
         if values[4] is not None:
             # Scalar field
             scalar_field_v3 = xr.DataArray(
                 data=values[4][:, l0:l1],
                 dims=['Features', 'cell'],
             )
-            arrays['scalar_field_v3'] = scalar_field_v3
+            arrays['scalar_field'] = scalar_field_v3
 
         if values[6] is not None:
             # Scalar field
             mask_v3 = xr.DataArray(
                 data=values[6][:, l0:l1],
                 dims=['Features', 'cell'],
             )
-            arrays['mask_v3'] = mask_v3
+            arrays['mask'] = mask_v3
 
         return arrays
 
@@ -272,8 +272,10 @@ def set_values_to_custom_grid(self, values: list, l0, l1,
         self.s_custom_grid = subsurface.UnstructuredData.from_array(
             vertex=xyz,
             cells="points",
-            attributes=arrays,
-            coords=coords)
+            cells_attr=arrays,
+            coords=coords,
+            default_cells_attr_name="block"
+        )
 
         return self.s_custom_grid
 

gempy/plot/plot_api.py

@@ -345,7 +345,7 @@ def plot_3d(model, plotter_type='basic',
         img = gpv.p.show(screenshot=True)
         plt.imshow(img[1])
         plt.axis('off')
-        plt.show()
+        plt.show(block=False)
         gpv.p.close()
 
     if off_screen is False:

test/test_plotting/test_plot_3d.py

@@ -10,6 +10,10 @@
     warnings.warn('Unable to enable faulthandler:\n%s' % str(e))
 
 
+def test_pyvista_running():
+    from pyvista import examples
+    examples.plot_wave()
+
 def test_plot_3d_data_default(one_fault_model_no_interp):
     gpv = gp.plot.plot_3d(one_fault_model_no_interp,
                           plotter_type='basic', off_screen=True, image=True, notebook=False)

test/test_plotting/test_vista.py

@@ -90,6 +90,11 @@ def test_plot_surface_points_poly_live(self, vista_object_only_data_interactive)
         vista_object_only_data_interactive.live_updating = True
         vista_object_only_data_interactive.plot_surface_points()
         print('foo')
+        img = vista_object_only_data_interactive.p.show(screenshot=True, auto_close=False)
+        plt.imshow(img[1])
+        plt.show(block=False)
+        print('foo')
+
 
     def test_plot_surface_points_poly_static(self, vista_object_only_data):
         """