add back physics module interface

LLNL · Aug 21, 2024 · 7e2acd6 · 7e2acd6
1 parent ae121e9
commit 7e2acd6
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/src/serac/numerics/functional/quadrature_data.hpp b/src/serac/numerics/functional/quadrature_data.hpp
@@ -106,7 +106,7 @@ namespace serac {
  * @tparam the data type to be stored at each quadrature point
  *
  * @note users are not intended to create these objects directly, instead
- *       they should use the StateManager::newQuadratureDataBuffer()
+ *       they should use the PhysicsModule::createQuadratureDataBuffer()
  */
 template <typename T>
 struct QuadratureData {

diff --git a/src/serac/physics/solid_mechanics.hpp b/src/serac/physics/solid_mechanics.hpp
@@ -292,7 +292,7 @@ class SolidMechanics<order, dim, Parameters<parameter_space...>, std::integer_se
         if constexpr (dim == 3) {
           serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::LinearHardening>::State initial_state{};
           setMaterial(std::get<serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::LinearHardening>>(mat),
-                      StateManager::newQuadratureDataBuffer(mesh_tag, order, dim, initial_state));
+                      createQuadratureDataBuffer(initial_state));
         } else {
           SLIC_ERROR_ROOT("J2 materials only work for 3D simulations");
         }
@@ -301,7 +301,7 @@ class SolidMechanics<order, dim, Parameters<parameter_space...>, std::integer_se
         if constexpr (dim == 3) {
           serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::PowerLawHardening>::State initial_state{};
           setMaterial(std::get<serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::PowerLawHardening>>(mat),
-                      StateManager::newQuadratureDataBuffer(mesh_tag, order, dim, initial_state));
+                      createQuadratureDataBuffer(initial_state));
         } else {
           SLIC_ERROR_ROOT("J2 materials only work for 3D simulations");
         }
@@ -310,7 +310,7 @@ class SolidMechanics<order, dim, Parameters<parameter_space...>, std::integer_se
         if constexpr (dim == 3) {
           serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::VoceHardening>::State initial_state{};
           setMaterial(std::get<serac::solid_mechanics::J2SmallStrain<serac::solid_mechanics::VoceHardening>>(mat),
-                      StateManager::newQuadratureDataBuffer(mesh_tag, order, dim, initial_state));
+                      createQuadratureDataBuffer(initial_state));
         } else {
           SLIC_ERROR_ROOT("J2 materials only work for 3D simulations");
         }
@@ -409,6 +409,19 @@ class SolidMechanics<order, dim, Parameters<parameter_space...>, std::integer_se
     initializeSolidMechanicsStates();
   }
 
+  /**
+   * @brief Create a shared ptr to a quadrature data buffer for the given material type
+   *
+   * @tparam T the type to be created at each quadrature point
+   * @param initial_state the value to be broadcast to each quadrature point
+   * @return std::shared_ptr< QuadratureData<T> >
+   */
+  template <typename T>
+  qdata_type<T> createQuadratureDataBuffer(T initial_state)
+  {
+    return StateManager::newQuadratureDataBuffer(mesh_tag_, order, dim, initial_state);
+  }
+
   /**
    * @brief Set essential displacement boundary conditions (strongly enforced)
    *

diff --git a/src/serac/physics/tests/lce_Brighenti_tensile.cpp b/src/serac/physics/tests/lce_Brighenti_tensile.cpp
@@ -117,7 +117,7 @@ TEST(LiquidCrystalElastomer, Brighenti)
                                     transition_temperature, Nb2);
 
   LiquidCrystElastomerBrighenti::State initial_state{};
-  auto                                 qdata = StateManager::newQuadratureDataBuffer(mesh_tag, p, dim, initial_state);
+  auto                                 qdata = solid_solver.createQuadratureDataBuffer(initial_state);
   solid_solver.setMaterial(DependsOn<TEMPERATURE_INDEX, GAMMA_INDEX>{}, mat, qdata);
 
   // prescribe symmetry conditions

diff --git a/src/serac/physics/tests/solid.cpp b/src/serac/physics/tests/solid.cpp
@@ -74,7 +74,7 @@ void functional_solid_test_static_J2()
 
   Material::State initial_state{};
 
-  auto qdata = StateManager::newQuadratureDataBuffer(mesh_tag, p, dim, initial_state);
+  auto qdata = solid_solver.createQuadratureDataBuffer(initial_state);
 
   solid_solver.setMaterial(mat, qdata);
 

diff --git a/src/serac/physics/tests/thermal_mechanics.cpp b/src/serac/physics/tests/thermal_mechanics.cpp
@@ -72,7 +72,7 @@ void functional_test_static_3D(double expected_norm)
 
   GreenSaintVenantThermoelasticMaterial        material{rho, E, nu, c, alpha, theta_ref, k};
   GreenSaintVenantThermoelasticMaterial::State initial_state{};
-  auto qdata = StateManager::newQuadratureDataBuffer(mesh_tag, p, dim, initial_state);
+  auto                                         qdata = thermal_solid_solver.createQuadratureDataBuffer(initial_state);
   thermal_solid_solver.setMaterial(material, qdata);
 
   // Define the function for the initial temperature and boundary condition
@@ -154,7 +154,7 @@ void functional_test_shrinking_3D(double expected_norm)
   double                                       k         = 1.0;
   GreenSaintVenantThermoelasticMaterial        material{rho, E, nu, c, alpha, theta_ref, k};
   GreenSaintVenantThermoelasticMaterial::State initial_state{};
-  auto qdata = StateManager::newQuadratureDataBuffer(mesh_tag, p, dim, initial_state);
+  auto                                         qdata = thermal_solid_solver.createQuadratureDataBuffer(initial_state);
   thermal_solid_solver.setMaterial(material, qdata);
 
   // Define the function for the initial temperature
@@ -249,7 +249,7 @@ void parameterized()
 
   ParameterizedGreenSaintVenantThermoelasticMaterial        material{rho, E, nu, c, alpha0, theta_ref, k};
   ParameterizedGreenSaintVenantThermoelasticMaterial::State initial_state{};
-  auto qdata = StateManager::newQuadratureDataBuffer(mesh_tag, p, dim, initial_state);
+  auto qdata = thermal_solid_solver.createQuadratureDataBuffer(initial_state);
   thermal_solid_solver.setMaterial(material, qdata);
 
   // parameterize the coefficient of thermal expansion

diff --git a/src/serac/physics/thermomechanics.hpp b/src/serac/physics/thermomechanics.hpp
@@ -250,6 +250,19 @@ class Thermomechanics : public BasePhysics {
     time_ += dt;
   }
 
+  /**
+   * @brief Create a shared ptr to a quadrature data buffer for the given material type
+   *
+   * @tparam T the type to be created at each quadrature point
+   * @param initial_state the value to be broadcast to each quadrature point
+   * @return std::shared_ptr< QuadratureData<T> >
+   */
+  template <typename T>
+  std::shared_ptr<QuadratureData<T>> createQuadratureDataBuffer(T initial_state)
+  {
+    return solid_.createQuadratureDataBuffer(initial_state);
+  }
+
   /**
    * @brief This is an adaptor class that makes a thermomechanical material usable by
    * the thermal module, by discarding the solid-mechanics-specific information