Add MaterialStates template parameter

stvdwtt · Mar 15, 2024 · 5c61db4 · 5c61db4
1 parent 73157ee
commit 5c61db4
Show file tree

Hide file tree

Showing 43 changed files with 2,201 additions and 1,014 deletions.
diff --git a/application/adamantine.cc b/application/adamantine.cc
diff --git a/application/adamantine.hh b/application/adamantine.hh
diff --git a/source/BodyForce.cc b/source/BodyForce.cc
@@ -11,16 +11,19 @@
 
 namespace adamantine
 {
-template <int dim, int p_order, typename MemorySpaceType>
-GravityForce<dim, p_order, MemorySpaceType>::GravityForce(
-    MaterialProperty<dim, p_order, MemorySpaceType> &material_properties)
+template <int dim, int p_order, typename MaterialStates,
+          typename MemorySpaceType>
+GravityForce<dim, p_order, MaterialStates, MemorySpaceType>::GravityForce(
+    MaterialProperty<dim, p_order, MaterialStates, MemorySpaceType>
+        &material_properties)
     : _material_properties(material_properties)
 {
 }
 
-template <int dim, int p_order, typename MemorySpaceType>
+template <int dim, int p_order, typename MaterialStates,
+          typename MemorySpaceType>
 dealii::Tensor<1, dim, double>
-GravityForce<dim, p_order, MemorySpaceType>::eval(
+GravityForce<dim, p_order, MaterialStates, MemorySpaceType>::eval(
     typename dealii::Triangulation<dim>::active_cell_iterator const &cell)
 {
   // Note that the density is independent of the temperature
@@ -33,5 +36,5 @@ GravityForce<dim, p_order, MemorySpaceType>::eval(
 }
 } // namespace adamantine
 
-INSTANTIATE_DIM_PORDER_HOST(TUPLE(GravityForce))
-INSTANTIATE_DIM_PORDER_DEVICE(TUPLE(GravityForce))
+INSTANTIATE_DIM_PORDER_MATERIALSTATES_HOST(TUPLE(GravityForce))
+INSTANTIATE_DIM_PORDER_MATERIALSTATES_DEVICE(TUPLE(GravityForce))
diff --git a/source/BodyForce.hh b/source/BodyForce.hh
@@ -29,18 +29,20 @@ struct BodyForce
 };
 
 // Forward declaration
-template <int dim, int p_order, typename MemorySpaceType>
+template <int dim, int p_order, typename MaterialStates,
+          typename MemorySpaceType>
 class MaterialProperty;
 
 /**
  * Gravity's body force.
  */
-template <int dim, int p_order, typename MemorySpaceType>
+template <int dim, int p_order, typename MaterialStates,
+          typename MemorySpaceType>
 class GravityForce final : public BodyForce<dim>
 {
 public:
-  GravityForce(
-      MaterialProperty<dim, p_order, MemorySpaceType> &material_properties);
+  GravityForce(MaterialProperty<dim, p_order, MaterialStates, MemorySpaceType>
+                   &material_properties);
 
   dealii::Tensor<1, dim, double>
   eval(typename dealii::Triangulation<dim>::active_cell_iterator const &cell)
@@ -51,7 +53,8 @@ private:
    * Gravity in \f$m/s^2\f$
    */
   static double constexpr g = 9.80665;
-  MaterialProperty<dim, p_order, MemorySpaceType> &_material_properties;
+  MaterialProperty<dim, p_order, MaterialStates, MemorySpaceType>
+      &_material_properties;
 };
 } // namespace adamantine
 

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -11,6 +11,7 @@ set(Adamantine_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/ImplicitOperator.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MaterialProperty.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MaterialProperty.templates.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/MaterialStates.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MechanicalOperator.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MechanicalPhysics.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/NewtonSolver.hh

diff --git a/source/Geometry.cc b/source/Geometry.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016 - 2021, the adamantine authors.
+/* Copyright (c) 2016 - 2024, the adamantine authors.
  *
  * This file is subject to the Modified BSD License and may not be distributed
  * without copyright and license information. Please refer to the file LICENSE
@@ -9,6 +9,7 @@
 #define GEOMETRY_TEMPLATES_HH
 
 #include <Geometry.hh>
+#include <MaterialStates.hh>
 #include <instantiation.hh>
 #include <types.hh>
 #include <utils.hh>
@@ -143,11 +144,12 @@ void Geometry<dim>::assign_material_state(
     {
       if (cell->center()[axis<dim>::z] < solid_height)
       {
-        cell->set_user_index(static_cast<int>(MaterialState::solid));
+        cell->set_user_index(static_cast<int>(SolidLiquidPowder::State::solid));
       }
       else
       {
-        cell->set_user_index(static_cast<int>(MaterialState::powder));
+        cell->set_user_index(
+            static_cast<int>(SolidLiquidPowder::State::powder));
       }
     }
   }
@@ -156,7 +158,7 @@ void Geometry<dim>::assign_material_state(
     // Everything is made of solid material
     for (auto cell : _triangulation.active_cell_iterators())
     {
-      cell->set_user_index(static_cast<int>(MaterialState::solid));
+      cell->set_user_index(static_cast<int>(SolidLiquidPowder::State::solid));
     }
   }
 }

diff --git a/source/MaterialProperty.cc b/source/MaterialProperty.cc
@@ -8,5 +8,5 @@
 #include <MaterialProperty.templates.hh>
 #include <instantiation.hh>
 
-INSTANTIATE_DIM_PORDER_HOST(TUPLE(MaterialProperty))
-INSTANTIATE_DIM_PORDER_DEVICE(TUPLE(MaterialProperty))
+INSTANTIATE_DIM_PORDER_MATERIALSTATES_HOST(TUPLE(MaterialProperty))
+INSTANTIATE_DIM_PORDER_MATERIALSTATES_DEVICE(TUPLE(MaterialProperty))