rename

modules/structural_simulation/structural_simulation_class.cpp

@@ -350,8 +350,8 @@ void StructuralSimulation::initializeContactBetweenTwoBodies(int first, int seco
     contact_list_.emplace_back(makeShared<SurfaceContactRelation>(*second_body, RealBodyVector({first_body})));
 
     int last = contact_list_.size() - 1;
-    contact_density_list_.push_back(makeShared<InteractionDynamics<solid_dynamics::ContactDensitySummation>>(*contact_list_[last - 1]));
-    contact_density_list_.push_back(makeShared<InteractionDynamics<solid_dynamics::ContactDensitySummation>>(*contact_list_[last]));
+    contact_density_list_.push_back(makeShared<InteractionDynamics<solid_dynamics::ContactFactorSummation>>(*contact_list_[last - 1]));
+    contact_density_list_.push_back(makeShared<InteractionDynamics<solid_dynamics::ContactFactorSummation>>(*contact_list_[last]));
 
     contact_force_list_.push_back(makeShared<InteractionWithUpdate<solid_dynamics::ContactForce>>(*contact_list_[last - 1]));
     contact_force_list_.push_back(makeShared<InteractionWithUpdate<solid_dynamics::ContactForce>>(*contact_list_[last]));
@@ -375,7 +375,7 @@ void StructuralSimulation::initializeAllContacts()
 
         contact_list_.emplace_back(makeShared<SurfaceContactRelation>(*contact_body, target_list));
         int last = contact_list_.size() - 1;
-        contact_density_list_.emplace_back(makeShared<InteractionDynamics<solid_dynamics::ContactDensitySummation>>(*contact_list_[last]));
+        contact_density_list_.emplace_back(makeShared<InteractionDynamics<solid_dynamics::ContactFactorSummation>>(*contact_list_[last]));
         contact_force_list_.emplace_back(makeShared<InteractionWithUpdate<solid_dynamics::ContactForce>>(*contact_list_[last]));
     }
     // continue appending the lists with the time dependent contacts
@@ -657,7 +657,7 @@ void StructuralSimulation::executeSpringNormalOnSurfaceParticles()
     }
 }
 
-void StructuralSimulation::executeContactDensitySummation()
+void StructuralSimulation::executeContactFactorSummation()
 {
     // number of contacts that are not time dependent: contact pairs * 2
     size_t number_of_general_contacts = contacting_body_pairs_list_.size();
@@ -844,7 +844,7 @@ void StructuralSimulation::runSimulationStep(Real &dt, Real &integration_time)
     executeSpringNormalOnSurfaceParticles();
 
     /** CONTACT */
-    executeContactDensitySummation();
+    executeContactFactorSummation();
     executeContactForce();
 
     /** STRESS RELAXATION, DAMPING, POSITIONAL CONSTRAINTS */

modules/structural_simulation/structural_simulation_class.h

@@ -205,7 +205,7 @@ class StructuralSimulation
     StdVec<SharedPtr<SimpleDynamics<solid_dynamics::UpdateElasticNormalDirection>>> particle_normal_update_;
 
     StdVec<SharedPtr<SurfaceContactRelation>> contact_list_;
-    StdVec<SharedPtr<InteractionDynamics<solid_dynamics::ContactDensitySummation>>> contact_density_list_;
+    StdVec<SharedPtr<InteractionDynamics<solid_dynamics::ContactFactorSummation>>> contact_density_list_;
     StdVec<SharedPtr<InteractionDynamics<solid_dynamics::ContactForce>>> contact_force_list_;
 
     // for initializeATimeStep
@@ -282,7 +282,7 @@ class StructuralSimulation
     void executeSurfacePressure();
     void executeSpringDamperConstraintParticleWise();
     void executeSpringNormalOnSurfaceParticles();
-    void executeContactDensitySummation();
+    void executeContactFactorSummation();
     void executeContactForce();
     void executeStressRelaxationFirstHalf(Real dt);
     void executeConstrainSolidBody();

src/shared/body_relations/contact_body_relation.h

@@ -88,7 +88,7 @@ class ContactRelation : public ContactRelationCrossResolution
 /**
  * @class ShellSurfaceContactRelation
  * @brief The relation between a solid body and its contact shell bodies
- *        This contact relation can only be used for ShellContactDensity
+ *        This contact relation can only be used for ShellContactFactor
  */
 class ShellSurfaceContactRelation : public ContactRelationCrossResolution
 {
@@ -194,7 +194,7 @@ class ContactRelationFromFluidToShell : public ContactRelationCrossResolution
  * @brief The relation between a solid/shell body and its contact solid/shell bodies
  *        NeighborBuilderContactFromSolidToSolid is used for solid contact bodies
  *        NeighborBuilderContactFromShellToSolid is used for shell contact bodies
- *        This class is used for RepulsionDensitySummation<Contact<>>
+ *        This class is used for RepulsionFactorSummation<Contact<>>
  */
 class SurfaceContactRelation : public ContactRelationCrossResolution
 {

src/shared/particle_dynamics/solid_dynamics/contact_dynamics/all_contact_dynamics.h

@@ -31,4 +31,4 @@
 
 #include "contact_friction.h"
 #include "contact_repulsion.h"
-#include "repulsion_density_summation.h"
+#include "repulsion_factor_summation.h"

src/shared/particle_dynamics/solid_dynamics/contact_dynamics/repulsion_density_summation.cpp → src/shared/particle_dynamics/solid_dynamics/contact_dynamics/repulsion_factor_summation.cpp

@@ -1,19 +1,19 @@
-#include "repulsion_density_summation.h"
+#include "repulsion_factor_summation.h"
 
 namespace SPH
 {
 namespace solid_dynamics
 {
 //=================================================================================================//
-RepulsionDensitySummation<Inner<>>::
-    RepulsionDensitySummation(SelfSurfaceContactRelation &self_contact_relation)
-    : RepulsionDensitySummation<Base, DataDelegateInner>(self_contact_relation, "SelfRepulsionFactor")
+RepulsionFactorSummation<Inner<>>::
+    RepulsionFactorSummation(SelfSurfaceContactRelation &self_contact_relation)
+    : RepulsionFactorSummation<Base, DataDelegateInner>(self_contact_relation, "SelfRepulsionFactor")
 {
     Real dp_1 = self_contact_relation.getSPHBody().sph_adaptation_->ReferenceSpacing();
     offset_W_ij_ = self_contact_relation.getSPHBody().sph_adaptation_->getKernel()->W(dp_1, ZeroVecd);
 }
 //=================================================================================================//
-void RepulsionDensitySummation<Inner<>>::interaction(size_t index_i, Real dt)
+void RepulsionFactorSummation<Inner<>>::interaction(size_t index_i, Real dt)
 {
     Real sigma = 0.0;
     const Neighborhood &inner_neighborhood = inner_configuration_[index_i];
@@ -25,13 +25,13 @@ void RepulsionDensitySummation<Inner<>>::interaction(size_t index_i, Real dt)
     repulsion_factor_[index_i] = sigma;
 }
 //=================================================================================================//
-RepulsionDensitySummation<Contact<>>::
-    RepulsionDensitySummation(SurfaceContactRelation &solid_body_contact_relation)
-    : RepulsionDensitySummation<Base, DataDelegateContact>(solid_body_contact_relation, "RepulsionFactor")
+RepulsionFactorSummation<Contact<>>::
+    RepulsionFactorSummation(SurfaceContactRelation &solid_body_contact_relation)
+    : RepulsionFactorSummation<Base, DataDelegateContact>(solid_body_contact_relation, "RepulsionFactor")
 {
 }
 //=================================================================================================//
-void RepulsionDensitySummation<Contact<>>::interaction(size_t index_i, Real dt)
+void RepulsionFactorSummation<Contact<>>::interaction(size_t index_i, Real dt)
 {
     /** Contact interaction. */
     Real sigma = 0.0;
@@ -47,8 +47,8 @@ void RepulsionDensitySummation<Contact<>>::interaction(size_t index_i, Real dt)
     repulsion_factor_[index_i] = sigma;
 };
 //=================================================================================================//
-ShellContactDensity::ShellContactDensity(ShellSurfaceContactRelation &solid_body_contact_relation)
-    : RepulsionDensitySummation<Base, DataDelegateContact>(solid_body_contact_relation, "RepulsionFactor"),
+ShellContactFactor::ShellContactFactor(ShellSurfaceContactRelation &solid_body_contact_relation)
+    : RepulsionFactorSummation<Base, DataDelegateContact>(solid_body_contact_relation, "RepulsionFactor"),
       solid_(DynamicCast<Solid>(this, sph_body_.getBaseMaterial())),
       kernel_(solid_body_contact_relation.getSPHBody().sph_adaptation_->getKernel()),
       particle_spacing_(solid_body_contact_relation.getSPHBody().sph_adaptation_->ReferenceSpacing())
@@ -75,7 +75,7 @@ ShellContactDensity::ShellContactDensity(ShellSurfaceContactRelation &solid_body
     }
 }
 //=================================================================================================//
-void ShellContactDensity::interaction(size_t index_i, Real dt)
+void ShellContactFactor::interaction(size_t index_i, Real dt)
 {
     /** shell contact interaction. */
     Real sigma = 0.0;
@@ -100,12 +100,12 @@ void ShellContactDensity::interaction(size_t index_i, Real dt)
     repulsion_factor_[index_i] = contact_density_i;
 }
 //=================================================================================================//
-ShellSelfContactDensitySummation::ShellSelfContactDensitySummation(ShellSelfContactRelation &self_contact_relation)
-    : RepulsionDensitySummation<Base, DataDelegateInner>(self_contact_relation, "SelfRepulsionFactor")
+ShellSelfContactFactorSummation::ShellSelfContactFactorSummation(ShellSelfContactRelation &self_contact_relation)
+    : RepulsionFactorSummation<Base, DataDelegateInner>(self_contact_relation, "SelfRepulsionFactor")
 {
 }
 //=================================================================================================//
-void ShellSelfContactDensitySummation::interaction(size_t index_i, Real dt)
+void ShellSelfContactFactorSummation::interaction(size_t index_i, Real dt)
 {
     Real sigma = 0.0;
     const Neighborhood &inner_neighborhood = inner_configuration_[index_i];

src/shared/particle_dynamics/solid_dynamics/contact_dynamics/repulsion_density_summation.h → src/shared/particle_dynamics/solid_dynamics/contact_dynamics/repulsion_factor_summation.h

@@ -21,14 +21,14 @@
  *                                                                           *
  * ------------------------------------------------------------------------- */
 /**
- * @file 	repulsion_density_summation.h
+ * @file 	repulsion_factor_summation.h
  * @brief 	TBD.
  * @details TBD.
  * @author	Chi Zhang and Xiangyu Hu
  */
 
-#ifndef REPULSION_DENSITY_SUMMATION_H
-#define REPULSION_DENSITY_SUMMATION_H
+#ifndef REPULSION_FACTOR_SUMMATION_H
+#define REPULSION_FACTOR_SUMMATION_H
 
 #include "base_contact_dynamics.h"
 
@@ -38,60 +38,60 @@ namespace solid_dynamics
 {
 
 template <typename... InteractionTypes>
-class RepulsionDensitySummation;
+class RepulsionFactorSummation;
 
 template <class DataDelegationType>
-class RepulsionDensitySummation<Base, DataDelegationType>
+class RepulsionFactorSummation<Base, DataDelegationType>
     : public LocalDynamics, public DataDelegationType
 {
   public:
     template <class BaseRelationType>
-    RepulsionDensitySummation(BaseRelationType &base_relation, const std::string &variable_name)
+    RepulsionFactorSummation(BaseRelationType &base_relation, const std::string &variable_name)
         : LocalDynamics(base_relation.getSPHBody()), DataDelegationType(base_relation),
           repulsion_factor_(*this->particles_->template registerSharedVariable<Real>(variable_name)){};
-    virtual ~RepulsionDensitySummation(){};
+    virtual ~RepulsionFactorSummation(){};
 
   protected:
     StdLargeVec<Real> &repulsion_factor_;
 };
 
 template <>
-class RepulsionDensitySummation<Inner<>> : public RepulsionDensitySummation<Base, DataDelegateInner>
+class RepulsionFactorSummation<Inner<>> : public RepulsionFactorSummation<Base, DataDelegateInner>
 {
   public:
-    explicit RepulsionDensitySummation(SelfSurfaceContactRelation &self_contact_relation);
-    virtual ~RepulsionDensitySummation(){};
+    explicit RepulsionFactorSummation(SelfSurfaceContactRelation &self_contact_relation);
+    virtual ~RepulsionFactorSummation(){};
     void interaction(size_t index_i, Real dt = 0.0);
 
   protected:
     Real offset_W_ij_;
 };
-using SelfContactDensitySummation = RepulsionDensitySummation<Inner<>>;
+using SelfContactFactorSummation = RepulsionFactorSummation<Inner<>>;
 
 template <>
-class RepulsionDensitySummation<Contact<>> : public RepulsionDensitySummation<Base, DataDelegateContact>
+class RepulsionFactorSummation<Contact<>> : public RepulsionFactorSummation<Base, DataDelegateContact>
 {
   public:
-    explicit RepulsionDensitySummation(SurfaceContactRelation &solid_body_contact_relation);
-    virtual ~RepulsionDensitySummation(){};
+    explicit RepulsionFactorSummation(SurfaceContactRelation &solid_body_contact_relation);
+    virtual ~RepulsionFactorSummation(){};
     void interaction(size_t index_i, Real dt = 0.0);
 
   protected:
     StdVec<Real> offset_W_ij_;
 };
-using ContactDensitySummation = RepulsionDensitySummation<Contact<>>;
+using ContactFactorSummation = RepulsionFactorSummation<Contact<>>;
 /**
- * @class ShellContactDensity
+ * @class ShellContactFactor
  * @brief Computing the contact density due to shell contact using a
  * 		 surface integral being solved by Gauss-Legendre quadrature integration.
  *     This class can only be used when there's the source body only has contact to shell bodies,
  *     otherwise the contact density will be overwritten by that of solid contact bodies
  */
-class ShellContactDensity : public RepulsionDensitySummation<Base, DataDelegateContact>
+class ShellContactFactor : public RepulsionFactorSummation<Base, DataDelegateContact>
 {
   public:
-    explicit ShellContactDensity(ShellSurfaceContactRelation &solid_body_contact_relation);
-    virtual ~ShellContactDensity(){};
+    explicit ShellContactFactor(ShellSurfaceContactRelation &solid_body_contact_relation);
+    virtual ~ShellContactFactor(){};
     void interaction(size_t index_i, Real dt = 0.0);
 
   protected:
@@ -109,15 +109,15 @@ class ShellContactDensity : public RepulsionDensitySummation<Base, DataDelegateC
 };
 
 /**
- * @class ShellSelfContactDensitySummation
+ * @class ShellSelfContactFactorSummation
  * @brief Computing the contact density due to shell contact using dummy particle.
  */
-class ShellSelfContactDensitySummation : public RepulsionDensitySummation<Base, DataDelegateInner>
+class ShellSelfContactFactorSummation : public RepulsionFactorSummation<Base, DataDelegateInner>
 {
   public:
-    explicit ShellSelfContactDensitySummation(ShellSelfContactRelation &self_contact_relation);
+    explicit ShellSelfContactFactorSummation(ShellSelfContactRelation &self_contact_relation);
     void interaction(size_t index_i, Real dt = 0.0);
 };
 } // namespace solid_dynamics
 } // namespace SPH
-#endif // REPULSION_DENSITY_SUMMATION_H
+#endif // REPULSION_FACTOR_SUMMATION_H

tests/2d_examples/test_2d_ball_shell_collision/ball_shell_collision.cpp

@@ -173,7 +173,7 @@ int main(int ac, char *av[])
 
     Dynamics1Level<solid_dynamics::Integration1stHalfPK2> ball_stress_relaxation_first_half(ball_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> ball_stress_relaxation_second_half(ball_inner);
-    InteractionDynamics<solid_dynamics::ShellContactDensity> ball_update_contact_density(ball_contact);
+    InteractionDynamics<solid_dynamics::ShellContactFactor> ball_update_contact_density(ball_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> ball_compute_solid_contact_forces(ball_contact);
 
     ReduceDynamics<solid_dynamics::AcousticTimeStepSize> ball_get_time_step_size(ball);

tests/2d_examples/test_2d_collision/collision.cpp

@@ -194,9 +194,9 @@ int main(int ac, char *av[])
     Dynamics1Level<solid_dynamics::Integration1stHalfPK2> damping_ball_stress_relaxation_first_half(damping_ball_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> damping_ball_stress_relaxation_second_half(damping_ball_inner);
     /** Algorithms for solid-solid contact. */
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> free_ball_update_contact_density(free_ball_contact);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> free_ball_update_contact_density(free_ball_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> free_ball_compute_solid_contact_forces(free_ball_contact);
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> damping_ball_update_contact_density(damping_ball_contact);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> damping_ball_update_contact_density(damping_ball_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> damping_ball_compute_solid_contact_forces(damping_ball_contact);
     /** Damping for one ball */
     DampingWithRandomChoice<InteractionSplit<DampingPairwiseInner<Vec2d, FixedDampingRate>>>

tests/2d_examples/test_2d_self_contact/self_contact.cpp

@@ -145,7 +145,7 @@ int main(int ac, char *av[])
     InteractionWithUpdate<LinearGradientCorrectionMatrixInner> beam_corrected_configuration(beam_body_inner);
     Dynamics1Level<solid_dynamics::DecomposedIntegration1stHalf> stress_relaxation_first_half(beam_body_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> stress_relaxation_second_half(beam_body_inner);
-    InteractionDynamics<solid_dynamics::SelfContactDensitySummation> beam_self_contact_density(beam_self_contact);
+    InteractionDynamics<solid_dynamics::SelfContactFactorSummation> beam_self_contact_density(beam_self_contact);
     InteractionWithUpdate<solid_dynamics::SelfContactForce> beam_self_contact_forces(beam_self_contact);
 
     SimpleDynamics<BeamInitialCondition> beam_initial_velocity(beam_body);

tests/2d_examples/test_2d_shell_beam_collision/shell_beam_collision.cpp

@@ -186,7 +186,7 @@ int main(int ac, char *av[])
     Dynamics1Level<solid_dynamics::DecomposedIntegration1stHalf> beam_stress_relaxation_first_half(beam_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> beam_stress_relaxation_second_half(beam_inner);
     /** Algorithms for shell-solid contact. */
-    InteractionDynamics<solid_dynamics::ShellContactDensity> beam_shell_update_contact_density(beam_contact);
+    InteractionDynamics<solid_dynamics::ShellContactFactor> beam_shell_update_contact_density(beam_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> beam_compute_solid_contact_forces(beam_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceToWall> shell_compute_solid_contact_forces(shell_contact);
     DampingWithRandomChoice<InteractionSplit<DampingPairwiseInner<Vec2d, FixedDampingRate>>> beam_damping(0.5, beam_inner, "Velocity", physical_viscosity);

tests/2d_examples/test_2d_sliding/sliding.cpp

@@ -107,7 +107,7 @@ int main(int ac, char *av[])
     InteractionWithUpdate<LinearGradientCorrectionMatrixInner> free_cube_corrected_configuration(free_cube_inner);
     Dynamics1Level<solid_dynamics::Integration1stHalfPK2> free_cube_stress_relaxation_first_half(free_cube_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> free_cube_stress_relaxation_second_half(free_cube_inner);
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> free_cube_update_contact_density(free_cube_contact);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> free_cube_update_contact_density(free_cube_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> free_cube_compute_solid_contact_forces(free_cube_contact);
     DampingWithRandomChoice<InteractionSplit<DampingPairwiseInner<Vec2d, FixedDampingRate>>> damping(0.5, free_cube_inner, "Velocity", physical_viscosity);
 

tests/2d_examples/test_2d_sliding_solid_shell/test_2d_sliding_solid_shell.cpp

@@ -123,7 +123,7 @@ void run_simulation()
     Dynamics1Level<solid_dynamics::Integration1stHalfPK2> free_cube_stress_relaxation_first_half(free_cube_inner);
     Dynamics1Level<solid_dynamics::Integration2ndHalf> free_cube_stress_relaxation_second_half(free_cube_inner);
     /** Algorithms for solid-solid contact. */
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> free_cube_update_contact_density(free_cube_contact);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> free_cube_update_contact_density(free_cube_contact);
     InteractionWithUpdate<solid_dynamics::ContactForceFromWall> free_cube_compute_solid_contact_forces(free_cube_contact);
     /** Damping*/
     DampingWithRandomChoice<InteractionSplit<DampingPairwiseInner<Vec2d, FixedDampingRate>>>

tests/2d_examples/test_2d_three_ring_impact/test_2d_three_ring_impact.cpp

@@ -264,11 +264,11 @@ void three_ring_impact(int resolution_factor_l, int resolution_factor_m, int res
 
     // density
     // self contact
-    InteractionDynamics<solid_dynamics::ShellSelfContactDensitySummation> self_contact_density_m(self_contact_m);
+    InteractionDynamics<solid_dynamics::ShellSelfContactFactorSummation> self_contact_density_m(self_contact_m);
     // contact
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> contact_density_s(contact_s);
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> contact_density_m(contact_m);
-    InteractionDynamics<solid_dynamics::ContactDensitySummation> contact_density_l(contact_l);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> contact_density_s(contact_s);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> contact_density_m(contact_m);
+    InteractionDynamics<solid_dynamics::ContactFactorSummation> contact_density_l(contact_l);
 
     // force
     // self contact