Rename Elastic->NoFracture; add Elastic mechanics tag;

This is a breaking change for model definitions
ORNL · Jan 3, 2025 · 974bc90 · 974bc90
1 parent 0b93148
commit 974bc90
Show file tree

Hide file tree

Showing 18 changed files with 180 additions and 142 deletions.
diff --git a/examples/mechanics/crack_branching.cpp b/examples/mechanics/crack_branching.cpp
@@ -67,7 +67,7 @@ void crackBranchingExample( const std::string filename )
     // ====================================================
     //                    Force model
     // ====================================================
-    using model_type = CabanaPD::ForceModel<CabanaPD::PMB, CabanaPD::Fracture>;
+    using model_type = CabanaPD::ForceModel<CabanaPD::PMB>;
     model_type force_model( delta, K, G0 );
 
     // ====================================================

diff --git a/examples/mechanics/elastic_wave.cpp b/examples/mechanics/elastic_wave.cpp
@@ -55,7 +55,8 @@ void elasticWaveExample( const std::string filename )
     //                    Force model
     // ====================================================
     using model_type =
-        CabanaPD::ForceModel<CabanaPD::LinearLPS, CabanaPD::Elastic>;
+        CabanaPD::ForceModel<CabanaPD::LinearLPS, CabanaPD::Elastic,
+                             CabanaPD::NoFracture>;
     model_type force_model( delta, K, G );
 
     // ====================================================
@@ -100,7 +101,7 @@ void elasticWaveExample( const std::string filename )
     // ====================================================
     //                   Create solver
     // ====================================================
-    auto cabana_pd = CabanaPD::createSolverElastic<memory_space>(
+    auto cabana_pd = CabanaPD::createSolverNoFracture<memory_space>(
         inputs, particles, force_model );
 
     // ====================================================

diff --git a/examples/mechanics/fragmenting_cylinder.cpp b/examples/mechanics/fragmenting_cylinder.cpp
@@ -60,7 +60,7 @@ void fragmentingCylinderExample( const std::string filename )
     // ====================================================
     //                    Force model
     // ====================================================
-    using model_type = CabanaPD::ForceModel<CabanaPD::PMB, CabanaPD::Fracture>;
+    using model_type = CabanaPD::ForceModel<CabanaPD::PMB>;
     model_type force_model( delta, K, G0 );
     // using model_type =
     //      CabanaPD::ForceModel<CabanaPD::LPS, CabanaPD::Fracture>;

diff --git a/examples/mechanics/kalthoff_winkler.cpp b/examples/mechanics/kalthoff_winkler.cpp
@@ -78,10 +78,10 @@ void kalthoffWinklerExample( const std::string filename )
     // ====================================================
     //                    Force model
     // ====================================================
-    using model_type = CabanaPD::ForceModel<CabanaPD::PMB, CabanaPD::Fracture>;
+    using model_type = CabanaPD::ForceModel<CabanaPD::PMB>;
     model_type force_model( delta, K, G0 );
     // using model_type =
-    //     CabanaPD::ForceModel<CabanaPD::LPS, CabanaPD::Fracture>;
+    //     CabanaPD::ForceModel<CabanaPD::LPS>;
     // model_type force_model( delta, K, G, G0 );
 
     // ====================================================

diff --git a/examples/thermomechanics/thermal_deformation.cpp b/examples/thermomechanics/thermal_deformation.cpp
@@ -81,13 +81,14 @@ void thermalDeformationExample( const std::string filename )
     // ====================================================
     //                    Force model
     // ====================================================
-    auto force_model = CabanaPD::createForceModel(
-        model_type{}, CabanaPD::Elastic{}, *particles, delta, K, alpha, temp0 );
+    auto force_model =
+        CabanaPD::createForceModel( model_type{}, CabanaPD::NoFracture{},
+                                    *particles, delta, K, alpha, temp0 );
 
     // ====================================================
     //                   Create solver
     // ====================================================
-    auto cabana_pd = CabanaPD::createSolverElastic<memory_space>(
+    auto cabana_pd = CabanaPD::createSolverNoFracture<memory_space>(
         inputs, particles, force_model );
 
     // ====================================================

diff --git a/examples/thermomechanics/thermal_deformation_heat_transfer.cpp b/examples/thermomechanics/thermal_deformation_heat_transfer.cpp
@@ -91,13 +91,13 @@ void thermalDeformationHeatTransferExample( const std::string filename )
     //                    Force model
     // ====================================================
     auto force_model = CabanaPD::createForceModel(
-        model_type{}, CabanaPD::Elastic{}, *particles, delta, K, kappa, cp,
+        model_type{}, CabanaPD::NoFracture{}, *particles, delta, K, kappa, cp,
         alpha, temp0 );
 
     // ====================================================
     //                   Create solver
     // ====================================================
-    auto cabana_pd = CabanaPD::createSolverElastic<memory_space>(
+    auto cabana_pd = CabanaPD::createSolverNoFracture<memory_space>(
         inputs, particles, force_model );
 
     // ====================================================

diff --git a/src/CabanaPD_ForceModels.hpp b/src/CabanaPD_ForceModels.hpp
@@ -111,7 +111,8 @@ struct BaseDynamicTemperatureModel
     }
 };
 
-template <typename ModelType, typename DamageType,
+template <typename ModelType, typename PlasticityType = Elastic,
+          typename DamageType = Fracture,
           typename ThermalType = TemperatureIndependent, typename... DataTypes>
 struct ForceModel;
 

diff --git a/src/CabanaPD_HeatTransfer.hpp b/src/CabanaPD_HeatTransfer.hpp
@@ -36,7 +36,7 @@ class HeatTransfer : public Force<MemorySpace, BaseForceModel>
     using base_type::_neigh_list;
     using model_type = ModelType;
     static_assert(
-        std::is_same_v<typename model_type::fracture_type, Elastic> );
+        std::is_same_v<typename model_type::fracture_type, NoFracture> );
 
     // Running with mechanics as well; no reason to rebuild neighbors.
     template <class NeighborType>

diff --git a/src/CabanaPD_Solver.hpp b/src/CabanaPD_Solver.hpp
@@ -93,7 +93,7 @@ class SolverBase
 
 template <class MemorySpace, class InputType, class ParticleType,
           class ForceModelType, class ContactModelType = NoContact>
-class SolverElastic
+class SolverNoFracture
 {
   public:
     using memory_space = MemorySpace;
@@ -114,20 +114,20 @@ class SolverElastic
     using contact_type = Force<memory_space, ContactModelType>;
     using contact_model_type = ContactModelType;
 
-    SolverElastic( input_type _inputs,
-                   std::shared_ptr<particle_type> _particles,
-                   force_model_type force_model )
+    SolverNoFracture( input_type _inputs,
+                      std::shared_ptr<particle_type> _particles,
+                      force_model_type force_model )
         : inputs( _inputs )
         , particles( _particles )
         , _init_time( 0.0 )
     {
         setup( force_model );
     }
 
-    SolverElastic( input_type _inputs,
-                   std::shared_ptr<particle_type> _particles,
-                   force_model_type force_model,
-                   contact_model_type contact_model )
+    SolverNoFracture( input_type _inputs,
+                      std::shared_ptr<particle_type> _particles,
+                      force_model_type force_model,
+                      contact_model_type contact_model )
         : inputs( _inputs )
         , particles( _particles )
         , _init_time( 0.0 )
@@ -488,12 +488,12 @@ class SolverElastic
 template <class MemorySpace, class InputType, class ParticleType,
           class ForceModelType, class ContactModelType = NoContact>
 class SolverFracture
-    : public SolverElastic<MemorySpace, InputType, ParticleType, ForceModelType,
-                           ContactModelType>
+    : public SolverNoFracture<MemorySpace, InputType, ParticleType,
+                              ForceModelType, ContactModelType>
 {
   public:
-    using base_type = SolverElastic<MemorySpace, InputType, ParticleType,
-                                    ForceModelType, ContactModelType>;
+    using base_type = SolverNoFracture<MemorySpace, InputType, ParticleType,
+                                       ForceModelType, ContactModelType>;
     using exec_space = typename base_type::exec_space;
     using memory_space = typename base_type::memory_space;
 
@@ -735,24 +735,26 @@ class SolverFracture
 
 template <class MemorySpace, class InputsType, class ParticleType,
           class ForceModelType>
-auto createSolverElastic( InputsType inputs,
-                          std::shared_ptr<ParticleType> particles,
-                          ForceModelType model )
+auto createSolverNoFracture( InputsType inputs,
+                             std::shared_ptr<ParticleType> particles,
+                             ForceModelType model )
 {
-    return std::make_shared<
-        SolverElastic<MemorySpace, InputsType, ParticleType, ForceModelType>>(
+    return std::make_shared<SolverNoFracture<MemorySpace, InputsType,
+                                             ParticleType, ForceModelType>>(
         inputs, particles, model );
 }
 
 template <class MemorySpace, class InputsType, class ParticleType,
           class ForceModelType, class ContactModelType>
-auto createSolverElastic( InputsType inputs,
-                          std::shared_ptr<ParticleType> particles,
-                          ForceModelType model, ContactModelType contact_model )
+auto createSolverNoFracture( InputsType inputs,
+                             std::shared_ptr<ParticleType> particles,
+                             ForceModelType model,
+                             ContactModelType contact_model )
 {
-    return std::make_shared<SolverElastic<MemorySpace, InputsType, ParticleType,
-                                          ForceModelType, ContactModelType>>(
-        inputs, particles, model, contact_model );
+    return std::make_shared<
+        SolverNoFracture<MemorySpace, InputsType, ParticleType, ForceModelType,
+                         ContactModelType>>( inputs, particles, model,
+                                             contact_model );
 }
 
 template <class MemorySpace, class InputsType, class ParticleType,

diff --git a/src/CabanaPD_Types.hpp b/src/CabanaPD_Types.hpp
@@ -15,15 +15,19 @@
 namespace CabanaPD
 {
 // Fracture tags.
-struct Elastic
+struct NoFracture
 {
 };
 struct Fracture
 {
 };
 
-// Contact and DEM (contact without PD) tags.
+// Mechanics tags.
+struct Elastic
+{
+};
 
+// Contact and DEM (contact without PD) tags.
 struct NoContact
 {
 };
@@ -37,6 +41,7 @@ struct TemperatureIndependent
 {
     using base_type = TemperatureIndependent;
 };
+
 struct TemperatureDependent
 {
     using base_type = TemperatureDependent;

diff --git a/src/force/CabanaPD_ContactModels.hpp b/src/force/CabanaPD_ContactModels.hpp
@@ -42,7 +42,7 @@ struct NormalRepulsionModel : public ContactModel
 {
     // FIXME: This is for use as the primary force model.
     using base_model = PMB;
-    using fracture_type = Elastic;
+    using fracture_type = NoFracture;
     using thermal_type = TemperatureIndependent;
 
     using ContactModel::delta;

diff --git a/src/force/CabanaPD_ForceModels_LPS.hpp b/src/force/CabanaPD_ForceModels_LPS.hpp
@@ -18,11 +18,11 @@
 namespace CabanaPD
 {
 template <>
-struct ForceModel<LPS, Elastic> : public BaseForceModel
+struct ForceModel<LPS, Elastic, NoFracture> : public BaseForceModel
 {
     using base_type = BaseForceModel;
     using base_model = LPS;
-    using fracture_type = Elastic;
+    using fracture_type = NoFracture;
     using thermal_type = TemperatureIndependent;
 
     using base_type::delta;
@@ -34,7 +34,6 @@ struct ForceModel<LPS, Elastic> : public BaseForceModel
     double theta_coeff;
     double s_coeff;
 
-    ForceModel(){};
     ForceModel( const double _delta, const double _K, const double _G,
                 const int _influence = 0 )
         : base_type( _delta )
@@ -63,9 +62,10 @@ struct ForceModel<LPS, Elastic> : public BaseForceModel
 };
 
 template <>
-struct ForceModel<LPS, Fracture> : public ForceModel<LPS, Elastic>
+struct ForceModel<LPS, Elastic, Fracture>
+    : public ForceModel<LPS, Elastic, NoFracture>
 {
-    using base_type = ForceModel<LPS, Elastic>;
+    using base_type = ForceModel<LPS, Elastic, NoFracture>;
     using base_model = typename base_type::base_model;
     using fracture_type = Fracture;
     using thermal_type = base_type::thermal_type;
@@ -80,7 +80,6 @@ struct ForceModel<LPS, Fracture> : public ForceModel<LPS, Elastic>
     double s0;
     double bond_break_coeff;
 
-    ForceModel() {}
     ForceModel( const double _delta, const double _K, const double _G,
                 const double _G0, const int _influence = 0 )
         : base_type( _delta, _K, _G, _influence )
@@ -106,9 +105,10 @@ struct ForceModel<LPS, Fracture> : public ForceModel<LPS, Elastic>
 };
 
 template <>
-struct ForceModel<LinearLPS, Elastic> : public ForceModel<LPS, Elastic>
+struct ForceModel<LinearLPS, Elastic, NoFracture>
+    : public ForceModel<LPS, Elastic, NoFracture>
 {
-    using base_type = ForceModel<LPS, Elastic>;
+    using base_type = ForceModel<LPS, Elastic, NoFracture>;
     using base_model = typename base_type::base_model;
     using fracture_type = typename base_type::fracture_type;
     using thermal_type = base_type::thermal_type;
@@ -124,9 +124,10 @@ struct ForceModel<LinearLPS, Elastic> : public ForceModel<LPS, Elastic>
 };
 
 template <>
-struct ForceModel<LinearLPS, Fracture> : public ForceModel<LPS, Fracture>
+struct ForceModel<LinearLPS, Elastic, Fracture>
+    : public ForceModel<LPS, Elastic, Fracture>
 {
-    using base_type = ForceModel<LPS, Fracture>;
+    using base_type = ForceModel<LPS, Elastic, Fracture>;
     using base_model = typename base_type::base_model;
     using fracture_type = typename base_type::fracture_type;
     using thermal_type = base_type::thermal_type;