[Solver] extended MPM

include/solvers/mpm_base.h

@@ -112,7 +112,7 @@ class MPMBase : public MPM {
   void write_vtk(mpm::Index step, mpm::Index max_steps) override;
   //! Write VTK files for points
   void write_point_vtk(mpm::Index step, mpm::Index max_steps,
-                       mpm::Vector<PointBase<Tdim>>& points);
+                       const mpm::Vector<PointBase<Tdim>>& points);
 #endif
 
 #ifdef USE_PARTIO
@@ -127,29 +127,32 @@ class MPMBase : public MPM {
   //! Return coordinates of points
   //! \param[in] points the list of points
   std::vector<Eigen::Matrix<double, 3, 1>> points_coordinates(
-      mpm::Vector<PointBase<Tdim>>& points);
+      const mpm::Vector<PointBase<Tdim>>& points);
 
   //! Return point scalar data
   //! \param[in] attribute Name of the scalar data attribute
   //! \param[in] points the list of points
   //! \retval scalar_data Vector containing scalar properties from points
   std::vector<double> points_scalar_data(
-      const std::string& attribute, mpm::Vector<PointBase<Tdim>>& points) const;
+      const std::string& attribute,
+      const mpm::Vector<PointBase<Tdim>>& points) const;
 
   //! Return points vector data
   //! \param[in] attribute Name of the tensor data attribute
   //! \param[in] points the list of points
   //! \retval vector_data Vector containing vector properties from points
   std::vector<Eigen::Matrix<double, 3, 1>> points_vector_data(
-      const std::string& attribute, mpm::Vector<PointBase<Tdim>>& points) const;
+      const std::string& attribute,
+      const mpm::Vector<PointBase<Tdim>>& points) const;
 
   //! Return points tensor data
   //! \param[in] attribute Name of the tensor data attribute
   //! \param[in] points the list of points
   //! \retval tensor_data Vector containing tensor properties from points
   template <unsigned Tsize>
   std::vector<Eigen::Matrix<double, Tsize, 1>> points_tensor_data(
-      const std::string& attribute, mpm::Vector<PointBase<Tdim>>& points) const;
+      const std::string& attribute,
+      const mpm::Vector<PointBase<Tdim>>& points) const;
   /**@}*/
 
  private:

include/solvers/mpm_base.tcc

@@ -703,8 +703,9 @@ void mpm::MPMBase<Tdim>::write_vtk(mpm::Index step, mpm::Index max_steps) {
 
 //! Write VTK files for points
 template <unsigned Tdim>
-void mpm::MPMBase<Tdim>::write_point_vtk(mpm::Index step, mpm::Index max_steps,
-                                         mpm::Vector<PointBase<Tdim>>& points) {
+void mpm::MPMBase<Tdim>::write_point_vtk(
+    mpm::Index step, mpm::Index max_steps,
+    const mpm::Vector<PointBase<Tdim>>& points) {
 
   // VTK PolyData writer
   auto vtk_writer = std::make_unique<VtkWriter>(points_coordinates(points));
@@ -1687,7 +1688,7 @@ void mpm::MPMBase<Tdim>::initialise_nonlocal_mesh(const Json& mesh_props) {
 //! Return point coordinates
 template <unsigned Tdim>
 std::vector<Eigen::Matrix<double, 3, 1>> mpm::MPMBase<Tdim>::points_coordinates(
-    mpm::Vector<PointBase<Tdim>>& points) {
+    const mpm::Vector<PointBase<Tdim>>& points) {
   std::vector<Eigen::Matrix<double, 3, 1>> point_coordinates;
   for (auto pitr = points.cbegin(); pitr != points.cend(); pitr++) {
     Eigen::Vector3d coordinates;
@@ -1703,7 +1704,8 @@ std::vector<Eigen::Matrix<double, 3, 1>> mpm::MPMBase<Tdim>::points_coordinates(
 //! Return point scalar data
 template <unsigned Tdim>
 std::vector<double> mpm::MPMBase<Tdim>::points_scalar_data(
-    const std::string& attribute, mpm::Vector<PointBase<Tdim>>& points) const {
+    const std::string& attribute,
+    const mpm::Vector<PointBase<Tdim>>& points) const {
   std::vector<double> scalar_data;
   scalar_data.reserve(points.size());
   // Iterate over points and add scalar value to data
@@ -1715,7 +1717,8 @@ std::vector<double> mpm::MPMBase<Tdim>::points_scalar_data(
 //! Return point vector data
 template <unsigned Tdim>
 std::vector<Eigen::Matrix<double, 3, 1>> mpm::MPMBase<Tdim>::points_vector_data(
-    const std::string& attribute, mpm::Vector<PointBase<Tdim>>& points) const {
+    const std::string& attribute,
+    const mpm::Vector<PointBase<Tdim>>& points) const {
   std::vector<Eigen::Matrix<double, 3, 1>> vector_data;
   // Iterate over points
   for (auto pitr = points.cbegin(); pitr != points.cend(); pitr++) {
@@ -1737,7 +1740,7 @@ template <unsigned Tsize>
 std::vector<Eigen::Matrix<double, Tsize, 1>>
     mpm::MPMBase<Tdim>::points_tensor_data(
         const std::string& attribute,
-        mpm::Vector<PointBase<Tdim>>& points) const {
+        const mpm::Vector<PointBase<Tdim>>& points) const {
   std::vector<Eigen::Matrix<double, Tsize, 1>> tensor_data;
   // Iterate over points
   for (auto pitr = points.cbegin(); pitr != points.cend(); pitr++) {