Enable fracture without prenotch

ORNL · Jun 24, 2024 · a24df90 · a24df90
1 parent 25d3644
commit a24df90
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/CabanaPD_Solver.hpp b/src/CabanaPD_Solver.hpp
@@ -437,7 +437,7 @@ class SolverElastic
 };
 
 template <class MemorySpace, class InputType, class ParticleType,
-          class ForceModel, class PrenotchType>
+          class ForceModel>
 class SolverFracture
     : public SolverElastic<MemorySpace, InputType, ParticleType, ForceModel>
 {
@@ -454,12 +454,12 @@ class SolverFracture
     using force_model_type = ForceModel;
     using force_type = typename base_type::force_type;
     using neigh_iter_tag = Cabana::SerialOpTag;
-    using prenotch_type = PrenotchType;
     using input_type = typename base_type::input_type;
 
+    template <typename PrenotchType>
     SolverFracture( input_type _inputs,
                     std::shared_ptr<particle_type> _particles,
-                    force_model_type force_model, prenotch_type prenotch )
+                    force_model_type force_model, PrenotchType prenotch )
         : base_type( _inputs, _particles, force_model )
     {
         init_mu();
@@ -632,14 +632,25 @@ auto createSolverElastic( InputsType inputs,
         inputs, particles, model );
 }
 
+template <class MemorySpace, class InputsType, class ParticleType,
+          class ForceModel>
+auto createSolverFracture( InputsType inputs,
+                           std::shared_ptr<ParticleType> particles,
+                           ForceModel model )
+{
+    return std::make_shared<
+        SolverFracture<MemorySpace, InputsType, ParticleType, ForceModel>>(
+        inputs, particles, model );
+}
+
 template <class MemorySpace, class InputsType, class ParticleType,
           class ForceModel, class PrenotchType>
 auto createSolverFracture( InputsType inputs,
                            std::shared_ptr<ParticleType> particles,
                            ForceModel model, PrenotchType prenotch )
 {
-    return std::make_shared<SolverFracture<
-        MemorySpace, InputsType, ParticleType, ForceModel, PrenotchType>>(
+    return std::make_shared<
+        SolverFracture<MemorySpace, InputsType, ParticleType, ForceModel>>(
         inputs, particles, model, prenotch );
 }