[Refactor] Particle variables and functions handling

include/mesh.tcc

@@ -1202,8 +1202,10 @@ void mpm::Mesh<Tdim>::apply_traction_on_particles(double current_time) {
                           std::placeholders::_1, dir, traction));
   }
   if (!particle_tractions_.empty()) {
-    this->iterate_over_particles(std::bind(
-        &mpm::ParticleBase<Tdim>::map_traction_force, std::placeholders::_1));
+    this->iterate_over_particles(
+        [](std::shared_ptr<mpm::ParticleBase<Tdim>> ptr) {
+          return mpm::particle::map_traction_force<Tdim>(ptr);
+        });
   }
 }
 
@@ -1751,8 +1753,8 @@ void mpm::Mesh<Tdim>::inject_particles(double current_time) {
       }
     }
     for (auto particle : injected_particles) {
-      particle->compute_volume();
-      particle->compute_mass();
+      mpm::particle::compute_volume<Tdim>(particle);
+      mpm::particle::compute_mass<Tdim>(particle);
     }
   }
 }

include/mpm_properties.h

@@ -0,0 +1,26 @@
+#ifndef MPM_PROPERTIES_H_
+#define MPM_PROPERTIES_H_
+
+namespace mpm {
+namespace properties {
+//! Scalar Properties
+enum Scalar : unsigned int {
+  Mass = 0,
+  Volume = 1,
+  MassDensity = 2,
+  MassPressure = 3,
+  Pressure = 4
+};
+//! Vector Properties
+enum Vector : unsigned int {
+  Displacement = 0,
+  Velocity = 1,
+  Acceleration = 2,
+  Momentum = 3,
+  ExternalForce = 4,
+  InternalForce = 5
+};
+}  // namespace properties
+}  // namespace mpm
+
+#endif  // MPM_PROPERTIES_H_

include/node.h

@@ -65,6 +65,35 @@ class Node : public NodeBase<Tdim> {
   //! Return status
   bool status() const override { return status_; }
 
+  //! Update scalar property at the nodes
+  //! \param[in] property Name of the property to update
+  //! \param[in] update A boolean to update (true) or assign (false)
+  //! \param[in] phase Index corresponding to the phase
+  //! \param[in] value Property value from the particles in a cell
+  void update_scalar_property(mpm::properties::Scalar property, bool update,
+                              unsigned phase, double value) noexcept override;
+
+  //! Return property at a given node for a given phase
+  //! \param[in] property Name of the property to return
+  //! \param[in] phase Index corresponding to the phase
+  double scalar_property(mpm::properties::Scalar property,
+                         unsigned phase) const override;
+
+  //! Update vector property at the nodes
+  //! \param[in] property Name of the property to update
+  //! \param[in] update A boolean to update (true) or assign (false)
+  //! \param[in] phase Index corresponding to the phase
+  //! \param[in] value Property value from the particles in a cell
+  virtual void update_vector_property(
+      mpm::properties::Vector property, bool update, unsigned phase,
+      const Eigen::Matrix<double, Tdim, 1>& value) noexcept override;
+
+  //! Return property at a given node for a given phase
+  //! \param[in] property Name of the property to return
+  //! \param[in] phase Index corresponding to the phase
+  virtual Eigen::Matrix<double, Tdim, 1> vector_property(
+      mpm::properties::Vector property, unsigned phase) const override;
+
   //! Update mass at the nodes from particle
   //! \param[in] update A boolean to update (true) or assign (false)
   //! \param[in] phase Index corresponding to the phase
@@ -73,7 +102,9 @@ class Node : public NodeBase<Tdim> {
 
   //! Return mass at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
-  double mass(unsigned phase) const override { return mass_(phase); }
+  double mass(unsigned phase) const override {
+    return this->scalar_property(mpm::properties::Scalar::Mass, phase);
+  }
 
   //! Update volume at the nodes from particle
   //! \param[in] update A boolean to update (true) or assign (false)
@@ -84,7 +115,9 @@ class Node : public NodeBase<Tdim> {
 
   //! Return volume at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
-  double volume(unsigned phase) const override { return volume_(phase); }
+  double volume(unsigned phase) const override {
+    return this->scalar_property(mpm::properties::Scalar::Volume, phase);
+  }
 
   //! Assign concentrated force to the node
   //! \param[in] phase Index corresponding to the phase
@@ -111,7 +144,7 @@ class Node : public NodeBase<Tdim> {
   //! Return external force at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
   VectorDim external_force(unsigned phase) const override {
-    return external_force_.col(phase);
+    return this->vector_property(mpm::properties::Vector::ExternalForce, phase);
   }
 
   //! Update internal force (body force / traction force)
@@ -124,24 +157,31 @@ class Node : public NodeBase<Tdim> {
   //! Return internal force at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
   VectorDim internal_force(unsigned phase) const override {
-    return internal_force_.col(phase);
+    return this->vector_property(mpm::properties::Vector::InternalForce, phase);
   }
 
   //! Update pressure at the nodes from particle
+  //! \param[in] update A boolean to update (true) or assign (false)
   //! \param[in] phase Index corresponding to the phase
   //! \param[in] mass_pressure Product of mass x pressure of a particle
-  void update_mass_pressure(unsigned phase,
+  void update_mass_pressure(bool update, unsigned phase,
                             double mass_pressure) noexcept override;
 
+  //! Compute pressure from the mass pressure
+  virtual void compute_pressure() override;
+
   //! Assign pressure at the nodes from particle
   //! \param[in] update A boolean to update (true) or assign (false)
   //! \param[in] phase Index corresponding to the phase
-  //! \param[in] mass_pressure Product of mass x pressure of a particle
-  void assign_pressure(unsigned phase, double mass_pressure) override;
+  //! \param[in] pressure Pressure of a particle
+  virtual void update_pressure(bool update, unsigned phase,
+                               double pressure) override;
 
   //! Return pressure at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
-  double pressure(unsigned phase) const override { return pressure_(phase); }
+  double pressure(unsigned phase) const override {
+    return this->scalar_property(mpm::properties::Scalar::Pressure, phase);
+  }
 
   //! Update momentum at the nodes
   //! \param[in] update A boolean to update (true) or assign (false)
@@ -153,7 +193,7 @@ class Node : public NodeBase<Tdim> {
   //! Return momentum at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
   VectorDim momentum(unsigned phase) const override {
-    return momentum_.col(phase);
+    return this->vector_property(mpm::properties::Vector::Momentum, phase);
   }
 
   //! Compute velocity from the momentum
@@ -162,7 +202,7 @@ class Node : public NodeBase<Tdim> {
   //! Return velocity at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
   VectorDim velocity(unsigned phase) const override {
-    return velocity_.col(phase);
+    return this->vector_property(mpm::properties::Vector::Velocity, phase);
   }
 
   //! Update nodal acceleration
@@ -175,7 +215,7 @@ class Node : public NodeBase<Tdim> {
   //! Return acceleration at a given node for a given phase
   //! \param[in] phase Index corresponding to the phase
   VectorDim acceleration(unsigned phase) const override {
-    return acceleration_.col(phase);
+    return this->vector_property(mpm::properties::Vector::Acceleration, phase);
   }
 
   //! Compute acceleration and velocity
@@ -278,24 +318,12 @@ class Node : public NodeBase<Tdim> {
   unsigned dof_{std::numeric_limits<unsigned>::max()};
   //! Status
   bool status_{false};
-  //! Mass
-  Eigen::Matrix<double, 1, Tnphases> mass_;
-  //! Volume
-  Eigen::Matrix<double, 1, Tnphases> volume_;
-  //! External force
-  Eigen::Matrix<double, Tdim, Tnphases> external_force_;
-  //! Internal force
-  Eigen::Matrix<double, Tdim, Tnphases> internal_force_;
-  //! Pressure
-  Eigen::Matrix<double, 1, Tnphases> pressure_;
+  //! Scalar properties
+  std::vector<Eigen::Matrix<double, 1, Tnphases>> scalar_properties_;
+  //! Vector properties
+  std::vector<Eigen::Matrix<double, Tdim, Tnphases>> vector_properties_;
   //! Displacement
   Eigen::Matrix<double, Tdim, 1> contact_displacement_;
-  //! Velocity
-  Eigen::Matrix<double, Tdim, Tnphases> velocity_;
-  //! Momentum
-  Eigen::Matrix<double, Tdim, Tnphases> momentum_;
-  //! Acceleration
-  Eigen::Matrix<double, Tdim, Tnphases> acceleration_;
   //! Velocity constraints
   std::map<unsigned, double> velocity_constraints_;
   //! Rotation matrix for general velocity constraints