openfoam: update lagrangian tests

IO/Geometry/Testing/Cxx/TestOpenFOAMReaderLagrangianSerial.cxx

 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    TestSimplePointsReaderWriter.cxx
+  Module:    TestOpenFOAMReaderLagrangianSerial
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
   All rights reserved.
@@ -63,18 +63,13 @@ int TestOpenFOAMReaderLagrangianSerial(int argc, char* argv[])
   reader->SetFileName(filename);
   delete[] filename;
   reader->Update();
-
-  reader->SetTimeValue(0.01);
-  // reader->CreateCellToPointOn();
-  // reader->ReadZonesOn();
+  reader->SetTimeValue(0.005);
 
   // Re-read with everything selected
   reader->EnableAllPatchArrays();
   reader->Update();
-
   reader->Print(std::cout);
-  reader->GetOutput()->Print(std::cout);
-  // reader->GetOutput()->GetBlock(0)->Print(std::cout);
+  // reader->GetOutput()->Print(std::cout);
 
   auto* allBlocks = vtkMultiBlockDataSet::SafeDownCast(reader->GetOutput());
   auto* lagrangianBlocks = findBlock<vtkMultiBlockDataSet>(allBlocks, "lagrangian");
@@ -85,8 +80,8 @@ int TestOpenFOAMReaderLagrangianSerial(int argc, char* argv[])
     return 1;
   }
 
-  vtkIdType nClouds = 0;
-  vtkIdType nParticles = 0;
+  long nClouds = 0;
+  long nParticles = 0;
 
   const int nLagrangianFields = reader->GetNumberOfLagrangianArrays();
   std::cout << "----- Have " << nLagrangianFields << " Lagrangian fields" << std::endl;
@@ -97,14 +92,12 @@ int TestOpenFOAMReaderLagrangianSerial(int argc, char* argv[])
     std::string displayName(reader->GetPatchArrayName(i));
     auto slash = displayName.rfind('/');
 
-    if (displayName.compare(0, slash, "lagrangian") == 0 && slash != std::string::npos)
+    if (slash != std::string::npos && displayName.compare(0, ++slash, "lagrangian/") == 0)
     {
-      ++slash;
       std::string cloudName(displayName.substr(slash));
       std::cout << "  Display " << displayName << " = Cloud <" << cloudName << ">" << std::endl;
 
       auto* cloudData = findBlock<vtkPolyData>(lagrangianBlocks, cloudName.c_str());
-
       if (cloudData)
       {
         ++nClouds;

IO/Parallel/Testing/Cxx/CMakeLists.txt

@@ -2,6 +2,7 @@ if (TARGET VTK::ParallelMPI)
   vtk_add_test_mpi(vtkIOParallelCxxTests-MPI tests
     TESTING_DATA
     TestPOpenFOAMReader.cxx
+    TestPOpenFOAMReaderLagrangianSerial.cxx,NO_VALID
     TestPOpenFOAMReaderLagrangianUncollated.cxx,NO_VALID
     )
   vtk_test_cxx_executable(vtkIOParallelCxxTests-MPI tests)
@@ -9,6 +10,7 @@ endif()
 
 vtk_add_test_cxx(vtkIOParallelCxxTests tests
   TestPOpenFOAMReader.cxx
+  TestPOpenFOAMReaderLagrangianSerial.cxx,NO_VALID
   TestPOpenFOAMReaderLagrangianUncollated.cxx,NO_VALID
   TestBigEndianPlot3D.cxx,NO_VALID
   )

IO/Parallel/Testing/Cxx/TestPOpenFOAMReader.cxx

 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    TestSimplePointsReaderWriter.cxx
+  Module:    TestPOpenFOAMReader
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
   All rights reserved.

IO/Parallel/Testing/Cxx/TestPOpenFOAMReaderLagrangianSerial.cxx

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    TestPOpenFOAMReaderLagrangianSerial
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+#if VTK_MODULE_ENABLE_VTK_ParallelMPI
+#include "vtkMPIController.h"
+#else
+#include "vtkDummyController.h"
+#endif
+
+#include "vtkPOpenFOAMReader.h"
+
+#include "vtkCellData.h"
+#include "vtkCompositeDataSet.h"
+#include "vtkDataSetMapper.h"
+#include "vtkInformation.h"
+#include "vtkLogger.h"
+#include "vtkMultiBlockDataSet.h"
+#include "vtkPointData.h"
+#include "vtkPolyData.h"
+#include "vtkSmartPointer.h"
+#include "vtkTestUtilities.h"
+#include "vtkUnstructuredGrid.h"
+
+namespace
+{
+
+// Get named block of specified type
+template <class Type>
+static Type* findBlock(vtkMultiBlockDataSet* mb, const char* blockName)
+{
+  Type* dataset = nullptr;
+  const unsigned int nblocks = (mb ? mb->GetNumberOfBlocks() : 0u);
+  for (unsigned int blocki = 0; !dataset && blocki < nblocks; ++blocki)
+  {
+    vtkDataObject* obj = mb->GetBlock(blocki);
+    if (strcmp(mb->GetMetaData(blocki)->Get(vtkCompositeDataSet::NAME()), blockName) == 0)
+    {
+      dataset = Type::SafeDownCast(obj);
+    }
+    if (!dataset)
+    {
+      dataset = findBlock<Type>(vtkMultiBlockDataSet::SafeDownCast(obj), blockName);
+    }
+  }
+  return dataset;
+}
+
+} // End anonymous namespace
+
+int TestPOpenFOAMReaderLagrangianSerial(int argc, char* argv[])
+{
+#if VTK_MODULE_ENABLE_VTK_ParallelMPI
+  vtkNew<vtkMPIController> controller;
+#else
+  vtkNew<vtkDummyController> controller;
+#endif
+  controller->Initialize(&argc, &argv);
+  int rank = controller->GetLocalProcessId();
+  vtkLogger::SetThreadName("rank=" + std::to_string(rank));
+  vtkMultiProcessController::SetGlobalController(controller);
+
+  // Read file name.
+  char* filename = vtkTestUtilities::ExpandDataFileName(
+    argc, argv, "Data/OpenFOAM/simplifiedSiwek-serial/simplifiedSiwek-serial.foam");
+
+  // Read the file
+  vtkNew<vtkPOpenFOAMReader> reader;
+  reader->SetFileName(filename);
+  delete[] filename;
+  reader->SetCaseType(vtkPOpenFOAMReader::RECONSTRUCTED_CASE);
+  reader->Update();
+
+  reader->SetTimeValue(0.005);
+
+  // Re-read with everything selected
+  reader->EnableAllPatchArrays();
+  reader->Update();
+  reader->Print(std::cout);
+  // reader->GetOutput()->Print(std::cout);
+
+  auto* allBlocks = vtkMultiBlockDataSet::SafeDownCast(reader->GetOutput());
+  auto* lagrangianBlocks = findBlock<vtkMultiBlockDataSet>(allBlocks, "lagrangian");
+
+  if (!lagrangianBlocks)
+  {
+    std::cout << "No lagrangian blocks!\n";
+    return 1;
+  }
+
+  long nClouds = 0;
+  long nParticles = 0;
+  int hasLagrangian = 0;
+
+  do
+  {
+    auto* allBlocks = vtkMultiBlockDataSet::SafeDownCast(reader->GetOutput());
+    if (!allBlocks)
+    {
+      std::cout << "No blocks!\n";
+      break;
+    }
+    std::cout << "Read " << allBlocks->GetNumberOfBlocks() << " blocks" << std::endl;
+
+    auto* lagrangianBlocks = findBlock<vtkMultiBlockDataSet>(allBlocks, "lagrangian");
+    if (!lagrangianBlocks)
+    {
+      std::cout << "No lagrangian blocks!\n";
+      break;
+    }
+
+    // Bad name, but it is what we have
+    for (int i = 0; i < reader->GetNumberOfPatchArrays(); ++i)
+    {
+      std::string displayName(reader->GetPatchArrayName(i));
+      auto slash = displayName.rfind('/');
+
+      if (slash != std::string::npos && displayName.compare(0, ++slash, "lagrangian/") == 0)
+      {
+        hasLagrangian = 1;
+        std::string cloudName(displayName.substr(slash));
+        std::cout << "  Display " << displayName << " = Cloud <" << cloudName << ">" << std::endl;
+
+        auto* cloudData = findBlock<vtkPolyData>(lagrangianBlocks, cloudName.c_str());
+        if (cloudData)
+        {
+          ++nClouds;
+          nParticles += static_cast<long>(cloudData->GetNumberOfPoints());
+        }
+      }
+    }
+  } while (false);
+
+  int globalHasLagrangian = hasLagrangian;
+  long nGlobalClouds = nClouds;
+  long nGlobalParticles = nParticles;
+
+  // maxOp for clouds may be misleading, but good enough for test
+  controller->AllReduce(&hasLagrangian, &globalHasLagrangian, 1, vtkCommunicator::LOGICAL_OR_OP);
+  controller->AllReduce(&nClouds, &nGlobalClouds, 1, vtkCommunicator::MAX_OP);
+  controller->AllReduce(&nParticles, &nGlobalParticles, 1, vtkCommunicator::SUM_OP);
+
+  int retVal = 0;
+  if (rank == 0)
+  {
+    std::cout << "  Read " << nParticles << " particles from " << nClouds << " clouds" << std::endl;
+    retVal = (nParticles != 0);
+  }
+  controller->Barrier();
+  controller->Broadcast(&retVal, 1, 0);
+
+  return !retVal;
+}

IO/Parallel/Testing/Cxx/TestPOpenFOAMReaderLagrangianUncollated.cxx

 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    TestSimplePointsReaderWriter.cxx
+  Module:    TestPOpenFOAMReaderLagrangianUncollated
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
   All rights reserved.
@@ -81,21 +81,17 @@ int TestPOpenFOAMReaderLagrangianUncollated(int argc, char* argv[])
   reader->SetCaseType(vtkPOpenFOAMReader::DECOMPOSED_CASE);
   reader->Update();
 
-  reader->SetTimeValue(0.01);
+  reader->SetTimeValue(0.005);
+
   // Re-read with everything selected
   reader->EnableAllPatchArrays();
-  reader->SetCaseType(vtkPOpenFOAMReader::DECOMPOSED_CASE);
   reader->Update();
-
   reader->Print(std::cout);
   reader->GetOutput()->Print(std::cout);
-  // reader->GetOutput()->GetBlock(0)->Print(std::cout);
 
-  std::cout << "CaseType: " << int(reader->GetCaseType()) << std::endl;
-
-  int hasLagrangian = 0;
   long nClouds = 0;
   long nParticles = 0;
+  int hasLagrangian = 0;
 
   do
   {
@@ -120,15 +116,13 @@ int TestPOpenFOAMReaderLagrangianUncollated(int argc, char* argv[])
       std::string displayName(reader->GetPatchArrayName(i));
       auto slash = displayName.rfind('/');
 
-      if (displayName.compare(0, slash, "lagrangian") == 0 && slash != std::string::npos)
+      if (slash != std::string::npos && displayName.compare(0, ++slash, "lagrangian/") == 0)
       {
         hasLagrangian = 1;
-        ++slash;
         std::string cloudName(displayName.substr(slash));
         std::cout << "  Display " << displayName << " = Cloud <" << cloudName << ">" << std::endl;
 
         auto* cloudData = findBlock<vtkPolyData>(lagrangianBlocks, cloudName.c_str());
-
         if (cloudData)
         {
           ++nClouds;
@@ -147,9 +141,6 @@ int TestPOpenFOAMReaderLagrangianUncollated(int argc, char* argv[])
   controller->AllReduce(&nClouds, &nGlobalClouds, 1, vtkCommunicator::MAX_OP);
   controller->AllReduce(&nParticles, &nGlobalParticles, 1, vtkCommunicator::SUM_OP);
 
-  // No need for Barrier after AllReduce
-  controller->Finalize();
-
   int retVal = 0;
   if (rank == 0)
   {
@@ -159,13 +150,5 @@ int TestPOpenFOAMReaderLagrangianUncollated(int argc, char* argv[])
   controller->Barrier();
   controller->Broadcast(&retVal, 1, 0);
 
-  controller->Finalize();
-
-  if (!retVal)
-  {
-    std::cout << "WARNING: test needs revising" << std::endl;
-    return 0;
-  }
-
   return !retVal;
 }