Revert "fix(crop): use PVGeometryFilter"

This reverts commit 9c93c21.
There is no need for PVGeometryFilter anymore as removing
HIDDENCELL is done in EAMExtract

Author: danlipsa

src/e3sm_quickview/app.py

@@ -576,9 +576,7 @@ def _on_slicing_change(self, var, ind_var, **_):
 
         # Update avg computation
         # Get area variable to calculate weighted average
-        geom_filter = self.source.views["atmosphere_data"]
-        geom_filter.Update()
-        data = geom_filter.GetOutput()
+        data = self.source.views["atmosphere_data"]
         self.state.fields_avgs = compute.extract_avgs(
             data, self.selected_variable_names
         )
@@ -609,9 +607,7 @@ def _on_downstream_change(
 
         # Update avg computation
         # Get area variable to calculate weighted average
-        geom_filter = self.source.views["atmosphere_data"]
-        geom_filter.Update()
-        data = geom_filter.GetOutput()
+        data = self.source.views["atmosphere_data"]
         self.state.fields_avgs = compute.extract_avgs(
             data, self.selected_variable_names
         )

src/e3sm_quickview/pipeline.py

@@ -3,7 +3,6 @@
 from pathlib import Path
 
 from paraview import simple
-from paraview.modules.vtkPVVTKExtensionsFiltersRendering import vtkPVGeometryFilter
 from vtkmodules.vtkCommonCore import vtkLogger
 from vtkmodules.vtkRenderingCore import vtkActor, vtkPolyDataMapper
 
@@ -153,17 +152,8 @@ def __init__(self, projection="Mollweide"):
             Projection=projection,
             Translate=0,
         )
-        vtk_geometry = self.proj.GetClientSideObject()
-        self.vtk_geometry = vtkPVGeometryFilter(
-            use_outline=0,
-            block_colors_distinct_values=0,
-            generate_cell_normals=0,
-            generate_point_normals=0,
-            generate_feature_edges=0,
-            splitting=False,
-            triangulate=0,
-            input_connection=vtk_geometry.output_port,
-        )
+        self.geometry = simple.ExtractSurface(Input=self.proj)
+        self.vtk_geometry = self.geometry.GetClientSideObject()
 
         # Add observer to
         vtk_obj = self.reader.GetClientSideObject()
@@ -250,7 +240,7 @@ def update(self, time=0.0):
         if not self.valid:
             return
 
-        self.proj.UpdatePipeline(time)
+        self.geometry.UpdatePipeline(time)
 
     def crop(self, longitude_min_max, latitude_min_max):
         self._crop.TrimLongitude = range_to_trim(longitude_min_max, 180)
@@ -305,7 +295,7 @@ def UpdateSlicing(self, dimension, slice):
 
     def Update(self, data_file, conn_file):  # force_reload
         if self.data_reader.load(data_file, conn_file):
-            self.views["atmosphere_data"] = self.data_reader.vtk_geometry
+            self.views["atmosphere_data"] = self.data_reader.geometry
             self.views["continents"] = self.continent.proj
             self.views["grid_lines"] = self.grid_lines.proj
             return True

src/e3sm_quickview/utils/compute.py

@@ -1,6 +1,6 @@
-from typing import Optional
-
+from paraview import servermanager
 import numpy as np
+from typing import Optional
 
 
 def calculate_weighted_average(
@@ -33,8 +33,9 @@ def calculate_weighted_average(
         return float(np.mean(data))
 
 
-def extract_avgs(vtk_data, array_names):
+def extract_avgs(pv_data, array_names):
     results = {}
+    vtk_data = servermanager.Fetch(pv_data)
     area_array = vtk_data.GetCellData().GetArray("area")
     for name in array_names:
         vtk_array = vtk_data.GetCellData().GetArray(name)