Porting to Paraview 3.98.1

diff --git a/resources/ParaViewFilters.xml b/resources/ParaViewFilters.xml
index 68421f68074f43ea26c3b11b32da7244e5c574cd..22eb6da667a200f91d212570ac6ee7e8d3b1eb9d 100755 (executable)
--- a/resources/ParaViewFilters.xml
+++ b/resources/ParaViewFilters.xml
@@ -18,25 +18,27 @@
     <Proxy group="filters" name="ExtractHierarchicalLevel" icon=":/pqWidgets/Icons/pqGroupExtract24.png"/>
   </Category>
 
-  <Category name="DataAnalysis" menu_label="&amp;Data Analysis">
-    <Proxy group="filters" name="Calculator" icon=":/pqWidgets/Icons/pqCalculator24.png"/>
+  <Category name="DataAnalysis" menu_label="&amp;Data Analysis" show_in_toolbar="1" hide_for_tests="1">
+    <Proxy group="filters" name="Calculator"
+            icon=":/pqWidgets/Icons/pqCalculator24.png" omit_from_toolbar="1"/>
     <Proxy group="filters" name="ExtractSelection"
             icon=":/pqWidgets/Icons/pqExtractSelection24.png" />
     <Proxy group="filters" name="ExtractSelectionOverTime"
-            icon=":/pqWidgets/Icons/pqPlotCellOverTime24.png" />
+            icon=":/pqWidgets/Icons/pqPlotSelectionOverTime24.png" />
     <Proxy group="filters" name="ExtractHistogram"
-            icon=":/pqWidgets/Icons/pqHistogram24.png"/>
-    <Proxy group="filters" name="IntegrateAttributes" />
-    <Proxy group="filters" name="ExtractFieldDataOverTime" />
+            icon=":/pqWidgets/Icons/pqHistogram24.png" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="IntegrateAttributes" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="ExtractFieldDataOverTime"
+            icon=":/pqWidgets/Icons/pqPlotGlobalOverTime24.png" />
     <Proxy group="filters" name="ProbeLine"
-            icon=":/pqWidgets/Icons/pqPlotLineOverTime24.png" />
+            icon=":/pqWidgets/Icons/pqPlotOverLine24.png" />
     <Proxy group="filters" name="ProbePoint"
             icon=":/pqWidgets/Icons/pqProbeLocation24.png" />
-    <Proxy group="filters" name="PlotAttributes" />
-    <Proxy group="filters" name="PlotOnSortedLines" />
-    <Proxy group="filters" name="PlotOnIntersectionCurves" />
+    <Proxy group="filters" name="PlotAttributes" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="PlotOnSortedLines" omit_from_toolbar="1"/>
+    <Proxy group="filters" name="PlotOnIntersectionCurves" omit_from_toolbar="1"/>
     <Proxy group="filters" name="ProgrammableFilter"
-            icon=":/pqWidgets/Icons/pqProgrammableFilter24.png"/>
+            icon=":/pqWidgets/Icons/pqProgrammableFilter24.png" omit_from_toolbar="1"/>
   </Category>
 
   <Category name="Statistics" menu_label="&amp;Statistics">
@@ -49,7 +51,8 @@
 
   <Category name="Temporal" menu_label="&amp;Temporal">
     <Proxy group="filters" name="ParticleTracer" />
-    <Proxy group="filters" name="ParticlePathLines" />
+    <Proxy group="filters" name="ParticlePath" />
+    <Proxy group="filters" name="StreakLine" />
     <Proxy group="filters" name="TemporalCache" />
     <Proxy group="filters" name="TemporalInterpolator" />
     <Proxy group="filters" name="TemporalSnapToTimeStep" />
@@ -63,9 +66,32 @@
     <Proxy group="filters" name="IntersectFragments" />
   </Category>
 
-  <Proxy group="filters" name="AMRDualClip" />
-  <Proxy group="filters" name="AMRDualContour" />
-  <Proxy group="filters" name="AMRFlashContour" />
+  <Category name="CTH" menu_label="&amp;CTH">
+    <Proxy group="filters" name="CTHFragmentConnect"/>
+    <Proxy group="filters" name="CTHFragmentIntersect"/>
+    <Proxy group="filters" name="CTHPart" />
+    <Proxy group="filters" name="NonOverlappingLevelIdScalars" />
+    <Proxy group="filters" name="MaterialInterfaceFilter" />
+    <Proxy group="filters" name="AMRDualClip" />
+    <Proxy group="filters" name="AMRDualContour" />
+    <Proxy group="filters" name="ExtractHierarchicalLevel" />
+    <Proxy group="filters" name="ExtractHierarchicalDataSets" />
+  </Category>
+
+  <Category name="AMR" menu_label="&amp;AMR">
+    <Proxy group="filters" name="AMRDualMeshExtractor" />
+    <Proxy group="filters" name="AMRResampleFilter" />
+    <Proxy group="filters" name="AMRSlice" />
+    <Proxy group="filters" name="AMRToMultiBlock" />
+    <Proxy group="filters" name="AMRCutPlane" />
+    <Proxy group="filters" name="OverlappingLevelIdScalars" />
+    <Proxy group="filters" name="ExtractHierarchicalLevel" />
+    <Proxy group="filters" name="ExtractHierarchicalDataSets" />
+  </Category>
+
+  <Proxy group="filters" name="ImageDataToAMR" />
+  <Proxy group="filters" name="UniformGridPartitioner" />
+  <Proxy group="filters" name="AnnotateGlobalData" />
   <Proxy group="filters" name="Append" />
   <Proxy group="filters" name="AppendAttributes" />
   <Proxy group="filters" name="AppendPolyData" />
@@ -79,14 +105,13 @@
   <Proxy group="filters" name="CellDerivatives"/>
   <Proxy group="filters" name="CleanPolyData" />
   <Proxy group="filters" name="CleanUnstructuredGrid" />
+  <Proxy group="filters" name="CleanUnstructuredGridCells" />
   <Proxy group="filters" name="Clip" />
   <Proxy group="filters" name="ClipClosedSurface" />
   <Proxy group="filters" name="Contour" />
-  <Proxy group="filters" name="CTHFragmentConnect"/>
-  <Proxy group="filters" name="CTHFragmentIntersect"/>
-  <Proxy group="filters" name="CTHPart" />
   <Proxy group="filters" name="Curvatures" />
   <Proxy group="filters" name="Cut" />
+  <Proxy group="filters" name="CutEverything" />
   <Proxy group="filters" name="D3" />
   <Proxy group="filters" name="DataSetSurfaceFilter" />
   <Proxy group="filters" name="DataSetTriangleFilter" />
@@ -99,20 +124,21 @@
   <Proxy group="filters" name="ExtractGeometry" />
   <Proxy group="filters" name="ExtractGrid" />
   <Proxy group="filters" name="ExtractHistogram" />
-  <Proxy group="filters" name="ExtractHierarchicalLevel" />
   <Proxy group="filters" name="ExtractSelection" />
   <Proxy group="filters" name="ExtractSelectionOverTime" />
-  <Proxy group="filters" name="ExtractHierarchicalDataSets" />
   <Proxy group="filters" name="FeatureEdges" />
   <Proxy group="filters" name="FFTSelectionOverTime" />
+  <Proxy group="filters" name="GaussianSplatter"/>
   <Proxy group="filters" name="GenerateIdScalars"/>
   <Proxy group="filters" name="Glyph" />
   <Proxy group="filters" name="Gradient" />
   <Proxy group="filters" name="GridConnectivity" />
   <Proxy group="filters" name="GroupDataSets" />
+  <Proxy group="filters" name="ImageDataToAMR" />
+  <Proxy group="filters" name="ImageDataToPointSet" />
   <Proxy group="filters" name="IntegrateAttributes" />
   <Proxy group="filters" name="IntegrateFlowThroughSurface" />
-  <Proxy group="filters" name="LevelIdScalars" />
+  <!--  <Proxy group="filters" name="LevelIdScalars" /> -->
   <Proxy group="filters" name="LinearExtrusionFilter" />
   <Proxy group="filters" name="LoopSubdivisionFilter" />
   <Proxy group="filters" name="MaskPoints" />
@@ -125,6 +151,7 @@
   <Proxy group="filters" name="OutlineFilter" />
   <Proxy group="filters" name="ParticlePathLines" />
   <Proxy group="filters" name="ParticleTracer" />
+  <Proxy group="filters" name="PassArrays" />
   <Proxy group="filters" name="PlotAttributes" />
   <Proxy group="filters" name="PlotOnIntersectionCurves" />
   <Proxy group="filters" name="PlotOnSortedLines" />
@@ -137,12 +164,15 @@
   <Proxy group="filters" name="ProgrammableFilter" />
   <Proxy group="filters" name="PVConnectivityFilter" />
   <Proxy group="filters" name="PythonCalculator" />
+  <Proxy group="filters" name="PythonAnnotation" />
+  <Proxy group="filters" name="PythonExtractSelection" />
   <Proxy group="filters" name="QuadraturePointInterpolator" />
   <Proxy group="filters" name="QuadraturePointsGenerator" />
   <Proxy group="filters" name="QuadraturePointStatistics" />
   <Proxy group="filters" name="QuadratureSchemeDictionaryGenerator" />
   <Proxy group="filters" name="QuadricClustering" />
   <Proxy group="filters" name="RectilinearGridConnectivity" />
+  <Proxy group="filters" name="RectilinearGridToPointSet" />
   <Proxy group="filters" name="ReflectionFilter" />
   <Proxy group="filters" name="RibbonFilter" />
   <Proxy group="filters" name="RotationalExtrusionFilter" />
@@ -171,8 +201,15 @@
   <Proxy group="filters" name="UnstructuredGradient" />
   <Proxy group="filters" name="WarpScalar" />
   <Proxy group="filters" name="WarpVector" />
+  <Proxy group="filters" name="YoungsMaterialInterface"/>
   <Proxy group="filters" name="NormalGlyphs" />
   <Proxy group="filters" name="TableToPolyData" />
   <Proxy group="filters" name="TableToStructuredGrid" />
   <Proxy group="filters" name="IsoVolume" />
+
+  <Proxy group="filters" name="GenericClip" />
+  <Proxy group="filters" name="GenericContour" />
+  <Proxy group="filters" name="GenericCut" />
+  <Proxy group="filters" name="GenericStreamTracer" />
+  <Proxy group="filters" name="GenericGeometryFilter" />
 </ParaViewFilters>

diff --git a/resources/ParaViewReaders.xml b/resources/ParaViewReaders.xml
index ef7adc004f12a860d1cc6018f4b54cab39b727a4..dd88e53a06e9308bf87a5acb758f3b3c1bda695e 100755 (executable)
--- a/resources/ParaViewReaders.xml
+++ b/resources/ParaViewReaders.xml
@@ -4,8 +4,10 @@
     list i.e. if two readers can read the same extension, then the reader
     apperaring later will be tried first when reading the file.
   -->
+  <ProxyManager type="reader" />
   <Proxy group="sources" name="LSDynaReader" />
   <Proxy group="sources" name="PVDReader" />
+  <Proxy group="sources" name="XMLHierarchicalBoxDataReader" />
   <Proxy group="sources" name="XMLPolyDataReader"/>
   <Proxy group="sources" name="XMLUnstructuredGridReader" />
   <Proxy group="sources" name="XMLImageDataReader" />
@@ -17,7 +19,7 @@
   <Proxy group="sources" name="XMLPStructuredGridReader" />
   <Proxy group="sources" name="XMLPRectilinearGridReader" />
   <Proxy group="sources" name="XMLMultiBlockDataReader" />
-  <Proxy group="sources" name="XMLHierarchicalBoxDataReader" />
+  <Proxy group="sources" name="XMLUniformGridAMRReader" />
   <Proxy group="sources" name="LegacyVTKFileReader" />
   <Proxy group="sources" name="pvtkfile" />
   <Proxy group="sources" name="ensight" />
@@ -44,7 +46,7 @@
   <Proxy group="sources" name="AVSucdSeriesReader" />
   <Proxy group="sources" name="MetaImageReader" />
   <Proxy group="sources" name="NrrdReader" />
-  <Proxy group="sources" name="Facet Proxy" />
+  <Proxy group="sources" name="FacetReader" />
   <Proxy group="sources" name="PNGSeriesReader" />
   <Proxy group="sources" name="JPEGSeriesReader" />
   <Proxy group="sources" name="TIFFSeriesReader" />
@@ -65,6 +67,12 @@
   <Proxy group="sources" name="ParticleReader" />
   <Proxy group="sources" name="VPICReader" />
   <Proxy group="sources" name="WindBladeReader" />
+  <Proxy group="sources" name="NetCDFCAMReader" />
   <Proxy group="sources" name="NetCDFPOPReader" />
+  <Proxy group="sources" name="UnstructuredPOPReader" />
+  <Proxy group="sources" name="PNetCDFPOPReader" />
   <Proxy group="sources" name="MPASReader" />
+  <Proxy group="sources" name="EnzoParticlesReader" />
+  <Proxy group="sources" name="FlashParticlesReader" />
+  <Proxy group="sources" name="CMLMoleculeReader"/>
 </ParaViewReaders>

diff --git a/resources/ParaViewSources.xml b/resources/ParaViewSources.xml
index a2796a118011b0b7ef02eff0c98468e84390e5d5..b8b3cf8cb9da77b556039bca830caced1dde6def 100755 (executable)
--- a/resources/ParaViewSources.xml
+++ b/resources/ParaViewSources.xml
@@ -10,6 +10,7 @@
   <Proxy group="sources" name="DataObjectGenerator" />
   <Proxy group="sources" name="DiskSource" />
   <Proxy group="sources" name="HierarchicalFractal" />
+  <Proxy group="sources" name="HyperTreeGridSource" />
   <Proxy group="sources" name="LineSource" />
   <Proxy group="sources" name="ImageMandelbrotSource" />
   <Proxy group="sources" name="OctreeFractal" />
@@ -24,4 +25,5 @@
   <Proxy group="sources" name="TimeSource" />
   <Proxy group="sources" name="Ruler" />
   <Proxy group="sources" name="RTAnalyticSource" />
+  <Proxy group="sources" name="AMRGaussianPulseSource" />
 </ParaViewSources>

diff --git a/resources/ParaViewWriters.xml b/resources/ParaViewWriters.xml
index 92e8dc4a6d48436635276c06272e9e1bed3831ee..db7fd3e1cdc718f264590c749041bd364bafb8c2 100755 (executable)
--- a/resources/ParaViewWriters.xml
+++ b/resources/ParaViewWriters.xml
@@ -1,4 +1,5 @@
 <ParaViewWriters>
+  <ProxyManager type="writer" />
   <Proxy group="writers" name="XMLPVDWriter" />
   <Proxy group="writers" name="XMLHyperOctreeWriter" />
   <Proxy group="writers" name="XMLPolyDataWriter" />
@@ -12,7 +13,7 @@
   <Proxy group="writers" name="XMLPRectilinearGridWriter"/>
   <Proxy group="writers" name="XMLPImageDataWriter" />
   <Proxy group="writers" name="XMLMultiBlockDataWriter" />
-  <Proxy group="writers" name="XMLHierarchicalBoxDataWriter" />
+  <Proxy group="writers" name="XMLUniformGridAMRWriter" />
   <Proxy group="writers" name="DataSetWriter" />
   <Proxy group="writers" name="PDataSetWriter" />
   <Proxy group="writers" name="PPLYWriter" />

diff --git a/test/VisuPrs/Util/paravistest.py b/test/VisuPrs/Util/paravistest.py
index 0b257ccc178b7d4777403037924083ae3f950523..7326ae7da2246701c0a4d4dbbe2546a77258b34c 100755 (executable)
--- a/test/VisuPrs/Util/paravistest.py
+++ b/test/VisuPrs/Util/paravistest.py
@@ -87,12 +87,13 @@ class SalomeSession(object):
         self.port = port
         return
 
-    def __del__(self):
+    #VTN: workaround for crash on CentOS.6.3.64
+    #def __del__(self):
         #os.system('killSalomeWithPort.py {0}'.format(self.port))
         #os.system('killSalomeWithPort.py ' + self.port)
-        import killSalomeWithPort
-        killSalomeWithPort.killMyPort(self.port)
-        return
+        #import killSalomeWithPort
+        #killSalomeWithPort.killMyPort(self.port)
+        #return
     pass