Merge pull request #439 from Xiangyu-Hu/fix/typos_in_particles

correct the typos in particles
Xiangyu-Hu · Sep 22, 2023 · 05c4b50 · 05c4b50
2 parents d0ca341 + 379c1d7
commit 05c4b50
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 181 deletions.
diff --git a/src/for_2D_build/particles/solid_particles_supplementary.cpp b/src/for_2D_build/particles/solid_particles_supplementary.cpp
@@ -51,7 +51,7 @@ void VonMisesStress::update(size_t index_i, Real dt)
         sqrt(sigmaxx * sigmaxx + sigmayy * sigmayy - sigmaxx * sigmayy + 3.0 * sigmaxy * sigmaxy);
 }
 //=============================================================================================//
-void MidSurfaceVonMisesStressofShells::update(size_t index_i, Real dt)
+void MidSurfaceVonMisesStress::update(size_t index_i, Real dt)
 {
     Matd sigma = mid_surface_cauchy_stress_[index_i];
 

diff --git a/src/for_3D_build/particles/solid_particles_supplementary.cpp b/src/for_3D_build/particles/solid_particles_supplementary.cpp
@@ -57,7 +57,7 @@ void VonMisesStress::update(size_t index_i, Real dt)
              3.0 * (sigmaxy * sigmaxy + sigmaxz * sigmaxz + sigmayz * sigmayz));
 }
 //=============================================================================================//
-void MidSurfaceVonMisesStressofShells::update(size_t index_i, Real dt)
+void MidSurfaceVonMisesStress::update(size_t index_i, Real dt)
 {
     Matd sigma = mid_surface_cauchy_stress_[index_i];
 

diff --git a/src/shared/io_system/io_plt.cpp b/src/shared/io_system/io_plt.cpp
@@ -42,7 +42,7 @@ void BodyStatesRecordingToPlt::writeWithFileName(const std::string &sequence)
         if (body->checkNewlyUpdated())
         {
             BaseParticles &base_particles = body->getBaseParticles();
-            base_particles.computeDrivedVariables();
+            base_particles.computeDerivedVariables();
 
             if (state_recording_)
             {

diff --git a/src/shared/io_system/io_vtk.cpp b/src/shared/io_system/io_vtk.cpp
@@ -15,7 +15,7 @@ void BodyStatesRecordingToVtp::writeWithFileName(const std::string &sequence)
         if (body->checkNewlyUpdated())
         {
             BaseParticles &base_particles = body->getBaseParticles();
-            base_particles.computeDrivedVariables();
+            base_particles.computeDerivedVariables();
 
             if (state_recording_)
             {
@@ -92,7 +92,7 @@ void BodyStatesRecordingToVtpString::writeWithFileName(const std::string &sequen
         if (body->checkNewlyUpdated())
         {
             BaseParticles &base_particles = body->getBaseParticles();
-            base_particles.computeDrivedVariables();
+            base_particles.computeDerivedVariables();
 
             if (state_recording_)
             {

diff --git a/src/shared/particles/base_particles.cpp b/src/shared/particles/base_particles.cpp
@@ -152,7 +152,7 @@ void BaseParticles::writePltFileHeader(std::ofstream &output_file)
     };
 }
 //=================================================================================================//
-void BaseParticles::computeDrivedVariables()
+void BaseParticles::computeDerivedVariables()
 {
     for (auto &derived_variable : derived_variables_)
     {

diff --git a/src/shared/particles/base_particles.h b/src/shared/particles/base_particles.h
@@ -158,7 +158,7 @@ class BaseParticles
 
     template <class DerivedVariableMethod, class... Ts>
     void addDerivedVariableToWrite(Ts &&...);
-    void computeDrivedVariables();
+    void computeDerivedVariables();
     //----------------------------------------------------------------------
     //		Particle data for sorting
     //----------------------------------------------------------------------

diff --git a/src/shared/particles/particle_sorting.h b/src/shared/particles/particle_sorting.h
@@ -121,7 +121,7 @@ class QuickSortParticleRange
     QuickSortParticleRange(QuickSortParticleRange &range, split)
         : comp_(range.comp_), swap_sortable_particle_data_(range.swap_sortable_particle_data_), size_(splitRange(range))
           // +1 accounts for the pivot element, which is at its correct place
-          // already and, therefore, is not included into subranges.
+          // already and, therefore, is not included into sub-ranges.
           ,
           begin_(range.begin_ + range.size_ + 1)
     {