src/catalyst/catalystTools.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 #include "catalystTools.H"
 #include "Time.H"
 
-#include <vtkPVConfig.h>
 #include <vtkCPDataDescription.h>
 #include <vtkCPInputDataDescription.h>
 #include <vtkCPProcessor.h>
@@ -181,14 +180,8 @@ Foam::label Foam::catalyst::dataQuery::query(vtkCPProcessor* coproc)
 
         for (const word& fldName : dataq.fields(channel))
         {
-            #if (PARAVIEW_VERSION_MAJOR == 5) && \
-                (PARAVIEW_VERSION_MINOR < 6)
-            input->AddPointField(fldName.c_str());
-            input->AddCellField(fldName.c_str());
-            #else
             input->AddField(fldName.c_str(), vtkDataObject::CELL);
             input->AddField(fldName.c_str(), vtkDataObject::POINT);
-            #endif
         }
     }
 
@@ -212,13 +205,6 @@ Foam::label Foam::catalyst::dataQuery::query(vtkCPProcessor* coproc)
 
             for (const word& fldName : dataq.fields(channel))
             {
-                #if (PARAVIEW_VERSION_MAJOR == 5) && \
-                    (PARAVIEW_VERSION_MINOR < 6)
-                if (input->IsFieldNeeded(fldName.c_str()))
-                {
-                    requestedFields.insert(fldName);
-                }
-                #else
                 if
                 (
                     input->IsFieldNeeded(fldName.c_str(), vtkDataObject::CELL)
@@ -227,7 +213,6 @@ Foam::label Foam::catalyst::dataQuery::query(vtkCPProcessor* coproc)
                 {
                     requestedFields.insert(fldName);
                 }
-                #endif
             }
 
             dataq.set(channel, requestedFields);