clean

Author: DENEL Bertrand

src/coreComponents/mesh/CMakeLists.txt

@@ -104,8 +104,6 @@ set( mesh_headers
      mpiCommunications/NoOpEngine.hpp
      mpiCommunications/PartitionerManager.hpp
      mpiCommunications/DomainPartitioner.hpp
-     mpiCommunications/MeshPartitioner.hpp
-     mpiCommunications/CellGraphPartitioner.hpp
      mpiCommunications/GeometricPartitioner.hpp
      mpiCommunications/CartesianPartitioner.hpp
      mpiCommunications/ParticleCartesianPartitioner.hpp
@@ -191,8 +189,6 @@ set( mesh_sources
      mpiCommunications/NoOpEngine.cpp
      mpiCommunications/PartitionerManager.cpp
      mpiCommunications/DomainPartitioner.cpp
-     mpiCommunications/MeshPartitioner.cpp
-     mpiCommunications/CellGraphPartitioner.cpp
      mpiCommunications/GeometricPartitioner.cpp     
      mpiCommunications/CartesianPartitioner.cpp
      mpiCommunications/ParticleCartesianPartitioner.cpp
@@ -230,6 +226,9 @@ if( ENABLE_VTK )
          generators/VTKMeshGeneratorTools.hpp
          generators/VTKWellGenerator.hpp
          generators/VTKUtilities.hpp
+         mpiCommunications/MeshPartitioner.hpp
+         mpiCommunications/CellGraphPartitioner.hpp
+         mpiCommunications/LayeredMeshPartitioner.hpp
          )
     set( mesh_sources ${mesh_sources}
          generators/CollocatedNodes.cpp
@@ -239,6 +238,9 @@ if( ENABLE_VTK )
          generators/VTKMeshGeneratorTools.cpp
          generators/VTKWellGenerator.cpp
          generators/VTKUtilities.cpp
+         mpiCommunications/MeshPartitioner.cpp
+         mpiCommunications/CellGraphPartitioner.cpp
+         mpiCommunications/LayeredMeshPartitioner.cpp
          )
     list( APPEND tplDependencyList VTK::IOLegacy VTK::FiltersParallelDIY2 )
     if( ENABLE_MPI )

src/coreComponents/mesh/MeshManager.cpp

@@ -279,9 +279,20 @@ void MeshManager::createDefaultPartitioner( PartitionerManager & partitionerMana
   }
   else if( hasExternalMesh )
   {
-    GEOS_LOG_RANK_0( "No partitioner specified. "
-                     "Creating default CellGraphPartitioner for external mesh." );
-    partitionerManager.createChild( "CellGraphPartitioner", "defaultPartitioner" );
+    // Check if CellGraphPartitioner is available in the DomainPartitioner catalog, proxy for VTK availability
+    auto const & catalog = DomainPartitioner::getCatalog();
+    bool const hasCellGraphPartitioner = catalog.count( "CellGraphPartitioner" ) > 0;
+
+    if( hasCellGraphPartitioner )
+    {
+      GEOS_LOG_RANK_0( "No partitioner specified. "
+                       "Creating default CellGraphPartitioner for external mesh." );
+      partitionerManager.createChild( "CellGraphPartitioner", "defaultPartitioner" );
+    }
+    else
+    {
+      GEOS_ERROR( "External mesh detected but VTK is not available. " );
+    }
   }
   else
   {

src/coreComponents/mesh/generators/VTKMeshGenerator.cpp

@@ -380,9 +380,6 @@ vtk::AllMeshes redistributeMeshes( integer const logLevel,
   if( minCellsOnAnyRank == 0 )
   {
     mesh = vtk::redistributeByKdTree( *mesh );
-
-    std::cout << "Rank " << MpiWrapper::commRank()
-              << ": After KdTree redistribution - Cells: " << mesh->GetNumberOfCells()<<std::endl;
   }
 
   // ====================================================================
@@ -392,24 +389,14 @@ vtk::AllMeshes redistributeMeshes( integer const logLevel,
   {
     GEOS_WARNING( "Empty ranks detected after kdtree - redistributing to ensure all ranks have cells" );
     mesh = vtk::ensureNoEmptyRank( mesh, comm );
-
-    std::cout << "Rank " << MpiWrapper::commRank()
-              << ": After ensureNoEmptyRank - Cells: " << mesh->GetNumberOfCells()<<std::endl;
   }
 
   // ====================================================================
   // STEP 7: Final partitioning using the configured partitioner
   // ====================================================================
-  std::cout << "Rank " << MpiWrapper::commRank()
-            << ": Before final partitioning - Cells: " << mesh->GetNumberOfCells()<<std::endl;
-
   vtk::AllMeshes input( mesh, namesToFractures );
   vtk::AllMeshes result = meshPartitioner->partitionMeshes( input, comm );
 
-  std::cout << "Rank " << MpiWrapper::commRank()
-            << ": After final partitioning - Cells: "
-            << result.getMainMesh()->GetNumberOfCells()<<std::endl;
-
   // ====================================================================
   // STEP 8: Log redistribution statistics
   // ====================================================================

src/coreComponents/mesh/generators/VTKUtilities.hpp

@@ -232,16 +232,6 @@ AllMeshes applyPartitioning( AllMeshes & input,
                              arrayView1d< int64_t const > partitioning,
                              MPI_Comm comm );
 
-/**
- * @brief Exchange bounding boxes between MPI ranks
- *
- * @param mesh The mesh to compute and exchange bounding boxes for
- * @param comm MPI communicator
- * @return Vector of bounding boxes from all ranks
- */
-stdVector< vtkBoundingBox > exchangeBoundingBoxes( vtkDataSet & mesh, MPI_Comm comm );
-
-
 /**
  * @brief Compute the rank neighbor candidate list.
  * @param[in] boundingBoxes the bounding boxes used by the VTK partitioner for all ranks

src/coreComponents/mesh/mpiCommunications/GraphPartitionEngine.hpp

@@ -15,7 +15,6 @@
 
 /**
  * @file GraphPartitionEngine.hpp
- * @brief Low-level graph partitioning algorithms - NOT user-facing
  */
 
 #ifndef GEOS_PARTITIONER_GRAPHPARTITIONENGINE_HPP_

src/coreComponents/mesh/mpiCommunications/LayeredMeshPartitioner.cpp

@@ -12,7 +12,8 @@
  * See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
  * ------------------------------------------------------------------------------------------------------------
  */
-#include "LayeredMeshPartitioner.hpp"
+
+ #include "LayeredMeshPartitioner.hpp"
 #include "mesh/generators/VTKUtilities.hpp"
 
 namespace geos
@@ -43,16 +44,15 @@ void LayeredMeshPartitioner::postInputInitialization()
   MeshPartitioner::postInputInitialization();
 
   // Validate LayeredMeshPartitioner-specific parameters
-  GEOS_ERROR_IF( m_indexArrayName.empty(),
-                 "LayeredMeshPartitioner requires 'indexArrayName' to be specified" );
+  GEOS_THROW_IF( m_indexArrayName.empty(),
+                 "LayeredMeshPartitioner requires 'indexArrayName' to be specified", InputError );
 
-  GEOS_ERROR_IF_LE( m_numPartZ, 0,
-                    "LayeredMeshPartitioner requires 'numPartZ' > 0, got " << m_numPartZ );
+  GEOS_THROW_IF_LE_MSG( m_numPartZ, 0,
+                        GEOS_FMT( "LayeredMeshPartitioner requires 'numPartZ' > 0, got {}", m_numPartZ ), InputError );
 
   int const mpiSize = MpiWrapper::commSize( MPI_COMM_GEOS );
-  GEOS_ERROR_IF_NE( mpiSize % m_numPartZ, 0,
-                    "Total MPI ranks (" << mpiSize << ") must be evenly divisible by "
-                                        << "numPartZ (" << m_numPartZ << ")" );
+  GEOS_THROW_IF_NE_MSG( mpiSize % m_numPartZ, 0,
+                        GEOS_FMT( "Total MPI ranks ( {} ) must be evenly divisible by numPartZ ({})", mpiSize, m_numPartZ ), InputError );
 
   GEOS_LOG_RANK_0( GEOS_FMT( "LayeredMeshPartitioner: {} ranks will be partitioned into {} area partitions x {} layer partitions",
                              mpiSize, mpiSize / m_numPartZ, m_numPartZ ) );
@@ -90,9 +90,8 @@ void LayeredMeshPartitioner::processCommandLineOverrides( unsigned int const xpa
     // Default: partition into commSize parts
     int const mpiSize = MpiWrapper::commSize( MPI_COMM_GEOS );
 
-    GEOS_ERROR_IF_NE( mpiSize % m_numPartZ, 0,
-                      "Total MPI ranks (" << mpiSize << ") must be evenly divisible by "
-                                          << "numPartZ (" << m_numPartZ << ")" );
+    GEOS_THROW_IF_NE_MSG( mpiSize % m_numPartZ, 0,
+                          GEOS_FMT( "Total MPI ranks ({}) must be evenly divisible by numPartZ ({})", mpiSize, m_numPartZ ), InputError );
 
     int const areaPartitions = mpiSize / m_numPartZ;
     setPartitionCounts( 1, areaPartitions, m_numPartZ );

src/coreComponents/mesh/mpiCommunications/LayeredMeshPartitioner.hpp

@@ -16,6 +16,15 @@
 /**
  * @class LayeredMeshPartitioner
  */
+
+#ifndef GEOS_PARTITIONER_LAYEREDMESHPARTITIONER_HPP_
+#define GEOS_PARTITIONER_LAYEREDMESHPARTITIONER_HPP_
+
+#include "MeshPartitioner.hpp"
+
+namespace geos
+{
+
 class LayeredMeshPartitioner : public MeshPartitioner
 {
 public:
@@ -39,12 +48,6 @@ class LayeredMeshPartitioner : public MeshPartitioner
    */
   static string catalogName() { return "LayeredMeshPartitioner"; }
 
-  /**
-   * @brief Get the catalog name
-   * @return The catalog key
-   */
-  virtual string getCatalogName() const override { return catalogName(); }
-
   /**
    * @brief Process command-line partition count overrides
    *
@@ -95,3 +98,8 @@ class LayeredMeshPartitioner : public MeshPartitioner
   /// Number of partitions in layer Z-direction
   int m_numPartZ;
 };
+
+} // namespace geos
+
+
+#endif // GEOS_PARTITIONER_LAYEREDMESHPARTITIONER_HPP_

src/coreComponents/mesh/mpiCommunications/MeshPartitioner.cpp

@@ -22,6 +22,7 @@
 #include "MeshPartitioner.hpp"
 #include "GraphPartitionEngine.hpp"
 
+#include "mesh/generators/VTKMeshGeneratorTools.hpp"
 #include <vtkBoundingBox.h>
 
 #ifdef GEOS_USE_TRILINOS

src/coreComponents/schema/schema.xsd

@@ -327,6 +327,10 @@
 					<xsd:selector xpath="CellGraphPartitioner" />
 					<xsd:field xpath="@name" />
 				</xsd:unique>
+				<xsd:unique name="PartitionerLayeredMeshPartitionerUniqueName">
+					<xsd:selector xpath="LayeredMeshPartitioner" />
+					<xsd:field xpath="@name" />
+				</xsd:unique>
 				<xsd:unique name="PartitionerParticleCartesianUniqueName">
 					<xsd:selector xpath="ParticleCartesian" />
 					<xsd:field xpath="@name" />
@@ -2678,6 +2682,7 @@ Information output from lower logLevels is added with the desired log level
 		<xsd:choice minOccurs="0" maxOccurs="unbounded">
 			<xsd:element name="CartesianPartitioner" type="CartesianPartitionerType" />
 			<xsd:element name="CellGraphPartitioner" type="CellGraphPartitionerType" />
+			<xsd:element name="LayeredMeshPartitioner" type="LayeredMeshPartitionerType" />
 			<xsd:element name="ParticleCartesian" type="ParticleCartesianType" />
 		</xsd:choice>
 	</xsd:complexType>
@@ -2695,6 +2700,18 @@ Information output from lower logLevels is added with the desired log level
 		<!--name => A name is required for any non-unique nodes-->
 		<xsd:attribute name="name" type="groupName" use="required" />
 	</xsd:complexType>
+	<xsd:complexType name="LayeredMeshPartitionerType">
+		<!--engine => Graph partitioning engine (parmetis, ptscotch, or noop)-->
+		<xsd:attribute name="engine" type="string" default="parmetis" />
+		<!--indexArrayName => Name of VTK cell data array containing [area, layer] indices-->
+		<xsd:attribute name="indexArrayName" type="string" use="required" />
+		<!--numPartZ => Number of partitions in layer Z-direction-->
+		<xsd:attribute name="numPartZ" type="integer" default="1" />
+		<!--numRefinements => Number of refinement iterations for graph partitioning (ParMETIS only, ignored by other engines)-->
+		<xsd:attribute name="numRefinements" type="integer" default="0" />
+		<!--name => A name is required for any non-unique nodes-->
+		<xsd:attribute name="name" type="groupName" use="required" />
+	</xsd:complexType>
 	<xsd:complexType name="ParticleCartesianType">
 		<!--partitionCounts => Number of partitions in each direction [nx, ny, nz]-->
 		<xsd:attribute name="partitionCounts" type="integer_array" default="{0}" />

src/coreComponents/schema/schema.xsd.other

@@ -552,11 +552,13 @@
 		<xsd:choice minOccurs="0" maxOccurs="unbounded">
 			<xsd:element name="CartesianPartitioner" type="CartesianPartitionerType" />
 			<xsd:element name="CellGraphPartitioner" type="CellGraphPartitionerType" />
+			<xsd:element name="LayeredMeshPartitioner" type="LayeredMeshPartitionerType" />
 			<xsd:element name="ParticleCartesian" type="ParticleCartesianType" />
 		</xsd:choice>
 	</xsd:complexType>
 	<xsd:complexType name="CartesianPartitionerType" />
 	<xsd:complexType name="CellGraphPartitionerType" />
+	<xsd:complexType name="LayeredMeshPartitionerType" />
 	<xsd:complexType name="ParticleCartesianType" />
 	<xsd:complexType name="SolversType">
 		<xsd:choice minOccurs="0" maxOccurs="unbounded">