Replace single stk::mesh::Part pointer with stk::mesh::PartVector. Is…

…sue #1183 PartVectors allow for the specification of a field on a list of parts instead of one part at a time. For some classes it was only possible to pass a single part pointer for the field specification where a part vector would be more flexible. Started with register_nodal_fields: from: register_nodal_fields(stk::mesh::Part* part) to: register_nodal_fields(const stk::mesh::PartVector &part_vec) The stk::mesh::put_field_on_mesh function does not take a PartVector so create a Selector form a PartVector: stk::mesh::Selector selector = stk::mesh::selectUnion(part_vec); and use that instead. There were a couple of places where the construction of a PartVector from a single Part pointer: PartVector(1,Part*) was useful. There were a lot of files changed, but the changes are trivial.
Exawind · May 9, 2023 · df5a96c · df5a96c
1 parent bf95a95
commit df5a96c
Show file tree

Hide file tree

Showing 47 changed files with 310 additions and 243 deletions.
diff --git a/include/AMSAlgDriver.h b/include/AMSAlgDriver.h
@@ -34,7 +34,7 @@ class AMSAlgDriver
 
   AMSAlgDriver(Realm& realm);
   virtual ~AMSAlgDriver() = default;
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
   virtual void register_edge_fields(stk::mesh::Part* part);
   void register_interior_algorithm(stk::mesh::Part* part);
   void execute();

diff --git a/include/Algorithm.h b/include/Algorithm.h
@@ -33,7 +33,7 @@ class Algorithm
   Algorithm(Realm& realm, stk::mesh::Part* part);
 
   // provide part vector
-  Algorithm(Realm& realm, stk::mesh::PartVector& partVec);
+  Algorithm(Realm& realm, const stk::mesh::PartVector& partVec);
 
   virtual ~Algorithm();
 

diff --git a/include/ChienKEpsilonEquationSystem.h b/include/ChienKEpsilonEquationSystem.h
@@ -40,7 +40,7 @@ class ChienKEpsilonEquationSystem : public EquationSystem
 
   virtual void initialize();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   virtual void register_wall_bc(
     stk::mesh::Part* part,

diff --git a/include/CopyFieldAlgorithm.h b/include/CopyFieldAlgorithm.h
@@ -32,6 +32,15 @@ namespace nalu {
 class CopyFieldAlgorithm : public Algorithm
 {
 public:
+  CopyFieldAlgorithm(
+    Realm& realm,
+    const stk::mesh::PartVector &part_vec,
+    stk::mesh::FieldBase* fromField,
+    stk::mesh::FieldBase* toField,
+    const unsigned beginPos,
+    const unsigned endPos,
+    const stk::mesh::EntityRank entityRank);
+
   CopyFieldAlgorithm(
     Realm& realm,
     stk::mesh::Part* part,

diff --git a/include/EnthalpyEquationSystem.h b/include/EnthalpyEquationSystem.h
@@ -45,7 +45,7 @@ class EnthalpyEquationSystem : public EquationSystem
     const bool outputClippingDiag);
   virtual ~EnthalpyEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/EquationSystem.h b/include/EquationSystem.h
@@ -69,7 +69,7 @@ class EquationSystem
   virtual void populate_derived_quantities() {}
 
   // base class with desired default no-op
-  virtual void register_nodal_fields(stk::mesh::Part* /* part */) {}
+  virtual void register_nodal_fields(const stk::mesh::PartVector& /* part */) {}
 
   virtual void register_edge_fields(stk::mesh::Part* /* part */) {}
 

diff --git a/include/GammaEquationSystem.h b/include/GammaEquationSystem.h
@@ -34,7 +34,7 @@ class GammaEquationSystem : public EquationSystem
   GammaEquationSystem(EquationSystems& equationSystems);
   virtual ~GammaEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/LowMachEquationSystem.h b/include/LowMachEquationSystem.h
@@ -56,40 +56,42 @@ class LowMachEquationSystem : public EquationSystem
     EquationSystems& equationSystems, const bool elementContinuityEqs);
   virtual ~LowMachEquationSystem();
 
-  virtual void load(const YAML::Node&);
+  virtual void load(const YAML::Node&) override;
 
-  virtual void initialize();
+  virtual void initialize() override;
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void
+  register_nodal_fields(const stk::mesh::PartVector& part_vec) override;
 
-  virtual void register_edge_fields(stk::mesh::Part* part);
+  virtual void register_edge_fields(stk::mesh::Part* part) override;
 
-  virtual void
-  register_element_fields(stk::mesh::Part* part, const stk::topology& theTopo);
+  virtual void register_element_fields(
+    stk::mesh::Part* part, const stk::topology& theTopo) override;
 
   virtual void register_open_bc(
     stk::mesh::Part* part,
     const stk::topology& partTopo,
-    const OpenBoundaryConditionData& openBCData);
+    const OpenBoundaryConditionData& openBCData) override;
 
   virtual void register_surface_pp_algorithm(
-    const PostProcessingData& theData, stk::mesh::PartVector& partVector);
+    const PostProcessingData& theData,
+    stk::mesh::PartVector& partVector) override;
 
   virtual void register_initial_condition_fcn(
     stk::mesh::Part* part,
     const std::map<std::string, std::string>& theNames,
-    const std::map<std::string, std::vector<double>>& theParams);
+    const std::map<std::string, std::vector<double>>& theParams) override;
 
-  virtual void pre_iter_work();
-  virtual void solve_and_update();
+  virtual void pre_iter_work() override;
+  virtual void solve_and_update() override;
 
-  virtual void predict_state();
+  virtual void predict_state() override;
 
   void project_nodal_velocity();
 
-  void post_converged_work();
+  void post_converged_work() override;
 
-  virtual void post_iter_work();
+  virtual void post_iter_work() override;
 
   const bool
     elementContinuityEqs_; /* allow for mixed element/edge for continuity */
@@ -120,7 +122,8 @@ class MomentumEquationSystem : public EquationSystem
   virtual void initial_work() override;
   virtual void pre_timestep_work() override;
 
-  virtual void register_nodal_fields(stk::mesh::Part* part) override;
+  virtual void
+  register_nodal_fields(const stk::mesh::PartVector& part_vec) override;
 
   virtual void register_edge_fields(stk::mesh::Part* part) override;
 
@@ -236,57 +239,58 @@ class ContinuityEquationSystem : public EquationSystem
     EquationSystems& equationSystems, const bool elementContinuityEqs);
   virtual ~ContinuityEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void
+  register_nodal_fields(const stk::mesh::PartVector& part_vec) override;
 
-  virtual void register_edge_fields(stk::mesh::Part* part);
+  virtual void register_edge_fields(stk::mesh::Part* part) override;
 
-  virtual void
-  register_element_fields(stk::mesh::Part* part, const stk::topology& theTopo);
+  virtual void register_element_fields(
+    stk::mesh::Part* part, const stk::topology& theTopo) override;
 
-  virtual void register_interior_algorithm(stk::mesh::Part* part);
+  virtual void register_interior_algorithm(stk::mesh::Part* part) override;
 
   virtual void register_inflow_bc(
     stk::mesh::Part* part,
     const stk::topology& partTopo,
-    const InflowBoundaryConditionData& inflowBCData);
+    const InflowBoundaryConditionData& inflowBCData) override;
 
   virtual void register_open_bc(
     stk::mesh::Part* part,
     const stk::topology& partTopo,
-    const OpenBoundaryConditionData& openBCData);
+    const OpenBoundaryConditionData& openBCData) override;
 
   virtual void register_wall_bc(
     stk::mesh::Part* part,
     const stk::topology& theTopo,
-    const WallBoundaryConditionData& wallBCData);
+    const WallBoundaryConditionData& wallBCData) override;
 
   virtual void register_symmetry_bc(
     stk::mesh::Part* part,
     const stk::topology& theTopo,
-    const SymmetryBoundaryConditionData& symmetryBCData);
+    const SymmetryBoundaryConditionData& symmetryBCData) override;
 
   virtual void register_abltop_bc(
     stk::mesh::Part* part,
     const stk::topology& partTopo,
-    const ABLTopBoundaryConditionData& ablTopBCData);
+    const ABLTopBoundaryConditionData& ablTopBCData) override;
 
   virtual void register_non_conformal_bc(
-    stk::mesh::Part* part, const stk::topology& theTopo);
+    stk::mesh::Part* part, const stk::topology& theTopo) override;
 
-  virtual void register_overset_bc();
+  virtual void register_overset_bc() override;
 
-  virtual void initialize();
-  virtual void reinitialize_linear_system();
+  virtual void initialize() override;
+  virtual void reinitialize_linear_system() override;
 
   virtual void register_initial_condition_fcn(
     stk::mesh::Part* part,
     const std::map<std::string, std::string>& theNames,
-    const std::map<std::string, std::vector<double>>& theParams);
+    const std::map<std::string, std::vector<double>>& theParams) override;
 
   virtual void manage_projected_nodal_gradient(EquationSystems& eqSystems);
   virtual void compute_projected_nodal_gradient();
 
-  virtual void create_constraint_algorithm(stk::mesh::FieldBase*);
+  virtual void create_constraint_algorithm(stk::mesh::FieldBase*) override;
 
   const bool elementContinuityEqs_;
   const bool managePNG_;

diff --git a/include/MatrixFreeHeatCondEquationSystem.h b/include/MatrixFreeHeatCondEquationSystem.h
@@ -37,7 +37,7 @@ class MatrixFreeHeatCondEquationSystem final : public EquationSystem
   virtual ~MatrixFreeHeatCondEquationSystem();
 
   void initialize() final;
-  void register_nodal_fields(stk::mesh::Part* part) final;
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
   void register_interior_algorithm(stk::mesh::Part* part) final;
   void register_wall_bc(
     stk::mesh::Part* part,

diff --git a/include/MatrixFreeLowMachEquationSystem.h b/include/MatrixFreeLowMachEquationSystem.h
@@ -47,7 +47,7 @@ class MatrixFreeLowMachEquationSystem final : public EquationSystem
   MatrixFreeLowMachEquationSystem(EquationSystems&);
   virtual ~MatrixFreeLowMachEquationSystem();
   void initialize() final;
-  void register_nodal_fields(stk::mesh::Part*) final;
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
   void register_interior_algorithm(stk::mesh::Part*) final;
   double provide_norm() const final;
   double provide_scaled_norm() const final;
@@ -143,9 +143,9 @@ class MatrixFreeLowMachEquationSystem final : public EquationSystem
   void sync_field_on_periodic_nodes(std::string name, int len) const;
   void setup_and_compute_continuity_preconditioner();
   void compute_courant_reynolds();
-  void check_part_is_valid(const stk::mesh::Part*);
-  void
-  register_copy_state_algorithm(std::string, int dim, stk::mesh::Part& part);
+  void check_part_is_valid(const stk::mesh::PartVector&);
+  void register_copy_state_algorithm(
+    std::string, int dim, const stk::mesh::PartVector&);
 
   std::string get_muelu_xml_file_name();
 

diff --git a/include/ProjectedNodalGradientEquationSystem.h b/include/ProjectedNodalGradientEquationSystem.h
@@ -48,7 +48,7 @@ class ProjectedNodalGradientEquationSystem : public EquationSystem
 
   std::string get_name_given_bc(BoundaryConditionType BC);
 
-  void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/Realm.h b/include/Realm.h
@@ -188,7 +188,7 @@ class Realm
 
   void register_interior_algorithm(stk::mesh::Part* part);
 
-  void register_nodal_fields(stk::mesh::Part* part);
+  void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_wall_bc(stk::mesh::Part* part, const stk::topology& theTopo);
 

diff --git a/include/ShearStressTransportEquationSystem.h b/include/ShearStressTransportEquationSystem.h
@@ -41,7 +41,7 @@ class ShearStressTransportEquationSystem : public EquationSystem
 
   virtual void initialize();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   virtual void register_wall_bc(
     stk::mesh::Part* part,

diff --git a/include/SpecificDissipationRateEquationSystem.h b/include/SpecificDissipationRateEquationSystem.h
@@ -34,7 +34,7 @@ class SpecificDissipationRateEquationSystem : public EquationSystem
   SpecificDissipationRateEquationSystem(EquationSystems& equationSystems);
   virtual ~SpecificDissipationRateEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/TotalDissipationRateEquationSystem.h b/include/TotalDissipationRateEquationSystem.h
@@ -34,7 +34,7 @@ class TotalDissipationRateEquationSystem : public EquationSystem
   TotalDissipationRateEquationSystem(EquationSystems& equationSystems);
   virtual ~TotalDissipationRateEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/TurbKineticEnergyEquationSystem.h b/include/TurbKineticEnergyEquationSystem.h
@@ -37,7 +37,7 @@ class TurbKineticEnergyEquationSystem : public EquationSystem
 
   virtual ~TurbKineticEnergyEquationSystem() = default;
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_interior_algorithm(stk::mesh::Part* part);
 

diff --git a/include/VolumeOfFluidEquationSystem.h b/include/VolumeOfFluidEquationSystem.h
@@ -44,7 +44,7 @@ class VolumeOfFluidEquationSystem : public EquationSystem
   VolumeOfFluidEquationSystem(EquationSystems& equationSystems);
   virtual ~VolumeOfFluidEquationSystem();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   virtual void register_edge_fields(stk::mesh::Part* part);
 

diff --git a/include/WallDistEquationSystem.h b/include/WallDistEquationSystem.h
@@ -33,7 +33,7 @@ class WallDistEquationSystem : public EquationSystem
 
   void initial_work();
 
-  void register_nodal_fields(stk::mesh::Part*);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   void register_edge_fields(stk::mesh::Part*);
 

diff --git a/include/WilcoxKOmegaEquationSystem.h b/include/WilcoxKOmegaEquationSystem.h
@@ -40,7 +40,7 @@ class WilcoxKOmegaEquationSystem : public EquationSystem
 
   virtual void initialize();
 
-  virtual void register_nodal_fields(stk::mesh::Part* part);
+  virtual void register_nodal_fields(const stk::mesh::PartVector& part_vec);
 
   virtual void register_wall_bc(
     stk::mesh::Part* part,

diff --git a/include/aero/AeroContainer.h b/include/aero/AeroContainer.h
@@ -37,7 +37,8 @@ class AeroContainer
   void setup(double timeStep, std::shared_ptr<stk::mesh::BulkData> stkBulk);
   void execute(double& timer);
   void init(double currentTime, double restartFrequency);
-  void register_nodal_fields(stk::mesh::MetaData& meta, stk::mesh::Part* part);
+  void register_nodal_fields(
+    stk::mesh::MetaData& meta, const stk::mesh::PartVector& part_vec);
   void update_displacements(const double currentTime);
   void predict_model_time_step(const double /*currentTime*/);
   void advance_model_time_step(const double /*currentTime*/);

diff --git a/include/property_evaluator/ThermalConductivityFromPrandtlPropAlgorithm.h b/include/property_evaluator/ThermalConductivityFromPrandtlPropAlgorithm.h
@@ -31,7 +31,7 @@ class ThermalConductivityFromPrandtlPropAlgorithm : public Algorithm
 public:
   ThermalConductivityFromPrandtlPropAlgorithm(
     Realm& realm,
-    stk::mesh::Part* part,
+    const stk::mesh::PartVector& part_vec,
     ScalarFieldType* thermalCond,
     ScalarFieldType* specificHeat,
     ScalarFieldType* viscosity,

diff --git a/include/utils/StkHelpers.h b/include/utils/StkHelpers.h
@@ -102,14 +102,14 @@ get_node_field(
 void register_scalar_nodal_field_on_part(
   stk::mesh::MetaData& meta,
   std::string name,
-  const stk::mesh::Part& selector,
+  const stk::mesh::Selector& selector,
   int num_states,
   double ic = 0);
 
 void register_vector_nodal_field_on_part(
   stk::mesh::MetaData& meta,
   std::string name,
-  const stk::mesh::Part& selector,
+  const stk::mesh::Selector& selector,
   int num_states,
   std::array<double, 3> x = {{0, 0, 0}});