Merge pull request #1010 from sandialabs/bartgol/set-field-bulk-data-…

…cleanup Cleaning up the set field/bulk data stage in the mesh structures
sandialabs · Feb 22, 2024 · 93c7e76 · 93c7e76
2 parents 8ddb4b8 + d5367bb
commit 93c7e76
Show file tree

Hide file tree

Showing 72 changed files with 1,107 additions and 2,339 deletions.
diff --git a/src/Albany_Application.cpp b/src/Albany_Application.cpp
@@ -3376,7 +3376,7 @@ Application::setScaleBCDofs(
     // nodeset specified via the sideset discretization.
     //
     /*const auto &sdn =
-        disc->getMeshStruct()->getMeshSpecs()[0]->sideSetMeshNames;
+        disc->getMeshStruct()->meshSpecs[0]->sideSetMeshNames;
     for (int isd = 0; isd < sdn.size(); ++isd) {
       const auto &sd = disc->getSideSetDiscretizations().at(sdn[isd]);
       for (auto iterator = sd->getNodeSets().begin();

diff --git a/src/SolutionManager.cpp b/src/SolutionManager.cpp
@@ -84,7 +84,9 @@ SolutionManager::SolutionManager(
 
     // This call allocates the non-overlapped MV
     current_soln = Thyra::createMembers(owned_vs,num_time_deriv+1);
-    disc_->getSolutionMV(*current_soln);
+    if (disc_->hasRestartSolution()) {
+      disc_->getSolutionMV(*current_soln);
+    }
 
     // Create the CombineAndScatterManager for handling distributed memory linear
     // algebra communications

diff --git a/src/corePDEs/problems/Albany_PopulateMesh.cpp b/src/corePDEs/problems/Albany_PopulateMesh.cpp
@@ -26,11 +26,6 @@ PopulateMesh::PopulateMesh (const Teuchos::RCP<Teuchos::ParameterList>& params_,
   neq = 1;
 }
 
-PopulateMesh::~PopulateMesh()
-{
-  // Nothing to be done here
-}
-
 void PopulateMesh::buildProblem (Teuchos::ArrayRCP<Teuchos::RCP<MeshSpecsStruct>> meshSpecs,
                                  StateManager& stateMgr)
 {

diff --git a/src/corePDEs/problems/Albany_PopulateMesh.hpp b/src/corePDEs/problems/Albany_PopulateMesh.hpp
@@ -44,7 +44,7 @@ class PopulateMesh : public Albany::AbstractProblem
                 const Teuchos::RCP<ParamLib>& paramLib_);
 
   //! Destructor
-  ~PopulateMesh();
+  ~PopulateMesh() = default;
 
   //! Return number of spatial dimensions
   virtual int spatialDimension() const { return 0; }
@@ -66,16 +66,6 @@ class PopulateMesh : public Albany::AbstractProblem
 
   bool useSDBCs() const { return use_sdbcs_; }
 
-private:
-
-  //! Private to prohibit copying
-  PopulateMesh(const PopulateMesh&);
-
-  //! Private to prohibit copying
-  PopulateMesh& operator=(const PopulateMesh&);
-
-public:
-
   //! Main problem setup routine. Not directly called, but indirectly by following functions
   template <typename EvalT> Teuchos::RCP<const PHX::FieldTag>
   constructEvaluators (PHX::FieldManager<PHAL::AlbanyTraits>& fm0,

diff --git a/src/disc/Albany_AbstractMeshStruct.hpp b/src/disc/Albany_AbstractMeshStruct.hpp
@@ -36,34 +36,22 @@ struct AbstractMeshStruct {
     //! Internal mesh specs type needed
     virtual std::string meshType() const = 0;
 
-    virtual void setFieldData(
-                  const Teuchos::RCP<const Teuchos_Comm>& commT,
-                  const Teuchos::RCP<Albany::StateInfoStruct>& sis,
-                  const unsigned int worksetSize,
-                  const std::map<std::string,Teuchos::RCP<Albany::StateInfoStruct> >& side_set_sis = {}) = 0;
-
-    virtual void setBulkData(
-                  const Teuchos::RCP<const Teuchos_Comm>& commT,
-                  const Teuchos::RCP<Albany::StateInfoStruct>& sis,
-                  const unsigned int worksetSize,
-                  const std::map<std::string,Teuchos::RCP<Albany::StateInfoStruct> >& side_set_sis = {}) = 0;
-
-    void setFieldAndBulkData(
-                  const Teuchos::RCP<const Teuchos_Comm>& commT,
-                  const Teuchos::RCP<Albany::StateInfoStruct>& sis,
-                  const unsigned int worksetSize,
-                  const std::map<std::string,Teuchos::RCP<Albany::StateInfoStruct> >& side_set_sis = {})
-                  {
-                    setFieldData(commT, sis, worksetSize, side_set_sis);
-                    setBulkData(commT, sis, worksetSize, side_set_sis);
-                  }
-
-    virtual Teuchos::ArrayRCP<Teuchos::RCP<Albany::MeshSpecsStruct> >& getMeshSpecs() = 0;
-    virtual const Teuchos::ArrayRCP<Teuchos::RCP<Albany::MeshSpecsStruct> >& getMeshSpecs() const = 0;
+    virtual void setFieldData (const Teuchos::RCP<const Teuchos_Comm>& comm,
+                               const Teuchos::RCP<StateInfoStruct>& sis) = 0;
+
+    virtual void setBulkData(const Teuchos::RCP<const Teuchos_Comm>& comm) = 0;
+
+    bool isBulkDataSet () const { return m_bulk_data_set; }
 
     Teuchos::RCP<LayeredMeshNumbering<GO> > global_cell_layers_data;
     Teuchos::RCP<LayeredMeshNumbering<LO> > local_cell_layers_data;
     Teuchos::ArrayRCP<double> mesh_layers_ratio;
+
+    Teuchos::ArrayRCP<Teuchos::RCP<MeshSpecsStruct> > meshSpecs;
+    std::map<std::string, Teuchos::RCP<AbstractMeshStruct>> sideSetMeshStructs;
+  protected:
+
+    bool m_bulk_data_set = false;
 };
 
 } // Namespace Albany