naming

Xiangyu-Hu · Jul 21, 2024 · 6ef7e27 · 6ef7e27
1 parent f86eb9b
commit 6ef7e27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/shared/particles/base_particles.cpp b/src/shared/particles/base_particles.cpp
@@ -18,7 +18,7 @@ BaseParticles::BaseParticles(SPHBody &sph_body, BaseMaterial *base_material)
       base_material_(*base_material),
       restart_xml_parser_("xml_restart", "particles"),
       reload_xml_parser_("xml_particle_reload", "particles"),
-      copy_particle_data_(all_state_data_),
+      copy_particle_state_(all_state_data_),
       write_restart_variable_to_xml_(variables_to_restart_, restart_xml_parser_),
       write_reload_variable_to_xml_(variables_to_reload_, reload_xml_parser_),
       read_restart_variable_from_xml_(variables_to_restart_, restart_xml_parser_)
@@ -80,7 +80,7 @@ void BaseParticles::increaseAllParticlesBounds(size_t buffer_size)
 //=================================================================================================//
 void BaseParticles::copyFromAnotherParticle(size_t index, size_t another_index)
 {
-    copy_particle_data_(index, another_index);
+    copy_particle_state_(index, another_index);
 }
 //=================================================================================================//
 size_t BaseParticles::allocateGhostParticles(size_t ghost_size)

diff --git a/src/shared/particles/base_particles.h b/src/shared/particles/base_particles.h
@@ -233,7 +233,7 @@ class BaseParticles
     // assembled variables and data sets
     //----------------------------------------------------------------------
   protected:
-    struct CopyParticleData
+    struct CopyParticleState
     {
         template <typename DataType>
         void operator()(DataContainerAddressKeeper<StdLargeVec<DataType>> &data_keeper, size_t index, size_t another_index);
@@ -257,7 +257,7 @@ class BaseParticles
         void operator()(DataContainerAddressKeeper<DiscreteVariable<DataType>> &variables, BaseParticles *base_particles);
     };
 
-    OperationOnDataAssemble<ParticleData, CopyParticleData> copy_particle_data_;
+    OperationOnDataAssemble<ParticleData, CopyParticleState> copy_particle_state_;
     OperationOnDataAssemble<ParticleVariables, WriteAParticleVariableToXml> write_restart_variable_to_xml_, write_reload_variable_to_xml_;
     OperationOnDataAssemble<ParticleVariables, ReadAParticleVariableFromXml> read_restart_variable_from_xml_;
 };

diff --git a/src/shared/particles/base_particles.hpp b/src/shared/particles/base_particles.hpp
@@ -243,7 +243,7 @@ void BaseParticles::sortParticles(SequenceMethod &sequence_method)
 }
 //=================================================================================================//
 template <typename DataType>
-void BaseParticles::CopyParticleData::
+void BaseParticles::CopyParticleState::
 operator()(DataContainerAddressKeeper<StdLargeVec<DataType>> &data_keeper, size_t index, size_t another_index)
 {
     for (size_t i = 0; i != data_keeper.size(); ++i)