From 09046b4ad68a2281e01f85c17853e7f1cf9244cf Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Wed, 21 Mar 2018 13:35:27 +0100
Subject: [PATCH] Fix some comments that incorrectly referred to capsules
---
src/pe/cr/DEM.impl.h | 4 ++--
src/pe/cr/Integrators.h | 4 ++--
src/pe/cr/PlainIntegrator.impl.h | 8 ++++----
src/pe/rigidbody/CylindricalBoundary.cpp | 8 ++++----
src/pe/rigidbody/CylindricalBoundary.h | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/pe/cr/DEM.impl.h b/src/pe/cr/DEM.impl.h
index c64669ba2..eb3a6b4e3 100644
--- a/src/pe/cr/DEM.impl.h
+++ b/src/pe/cr/DEM.impl.h
@@ -128,7 +128,7 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
WALBERLA_ASSERT( bodyIt->checkInvariants(), "Invalid body state detected" );
WALBERLA_ASSERT( !bodyIt->hasSuperBody(), "Invalid superordinate body detected" );
- // Moving the capsule according to the acting forces (don't move a sleeping capsule)
+ // Moving the body according to the acting forces (don't move a sleeping body)
if( bodyIt->isAwake() && !bodyIt->hasInfiniteMass() )
{
integrate_( *bodyIt, dt, *this );
@@ -138,7 +138,7 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
bodyIt->resetForceAndTorque();
// Checking the state of the rigid body
- WALBERLA_ASSERT( bodyIt->checkInvariants(), "Invalid capsule state detected" );
+ WALBERLA_ASSERT( bodyIt->checkInvariants(), "Invalid body state detected" );
// Resetting the acting forces
bodyIt->resetForceAndTorque();
diff --git a/src/pe/cr/Integrators.h b/src/pe/cr/Integrators.h
index 0c978fcda..1ea365f66 100644
--- a/src/pe/cr/Integrators.h
+++ b/src/pe/cr/Integrators.h
@@ -72,7 +72,7 @@ public:
// Setting the axis-aligned bounding box
id->calcBoundingBox();
- // Calculating the current motion of the capsule
+ // Calculating the current motion of the body
id->calcMotion();
}
};
@@ -120,7 +120,7 @@ public:
// Setting the axis-aligned bounding box
id->calcBoundingBox();
- // Calculating the current motion of the capsule
+ // Calculating the current motion of the body
id->calcMotion();
}
};
diff --git a/src/pe/cr/PlainIntegrator.impl.h b/src/pe/cr/PlainIntegrator.impl.h
index 7b9c4ce45..b96a6e2e0 100644
--- a/src/pe/cr/PlainIntegrator.impl.h
+++ b/src/pe/cr/PlainIntegrator.impl.h
@@ -65,14 +65,14 @@ void PlainIntegratorSolver<Integrator>::timestep( const real_t dt )
BodyStorage& localStorage = (*storage)[0];
for (auto bd = localStorage.begin(); bd != localStorage.end(); ++bd){
// Checking the state of the body
- WALBERLA_ASSERT( bd->checkInvariants(), "Invalid capsule state detected" );
+ WALBERLA_ASSERT( bd->checkInvariants(), "Invalid body state detected" );
WALBERLA_ASSERT( !bd->hasSuperBody(), "Invalid superordinate body detected" );
// Resetting the contact node and removing all attached contacts
// bd->resetNode();
bd->clearContacts();
- // Moving the capsule according to the acting forces (don't move a sleeping capsule)
+ // Moving the body according to the acting forces (don't move a sleeping body)
if( bd->isAwake() && !bd->hasInfiniteMass() ) {
integrate_( *bd, dt, *this );
}
@@ -80,8 +80,8 @@ void PlainIntegratorSolver<Integrator>::timestep( const real_t dt )
// Resetting the acting forces
bd->resetForceAndTorque();
- // Checking the state of the capsule
- WALBERLA_ASSERT( bd->checkInvariants(), "Invalid capsule state detected" );
+ // Checking the state of the body
+ WALBERLA_ASSERT( bd->checkInvariants(), "Invalid body state detected" );
}
}
if (tt_!=NULL) tt_->stop("Integrate Bodies");
diff --git a/src/pe/rigidbody/CylindricalBoundary.cpp b/src/pe/rigidbody/CylindricalBoundary.cpp
index 6b99c9463..66f639e49 100644
--- a/src/pe/rigidbody/CylindricalBoundary.cpp
+++ b/src/pe/rigidbody/CylindricalBoundary.cpp
@@ -56,7 +56,7 @@ namespace pe {
CylindricalBoundary::CylindricalBoundary( id_t sid, id_t uid, const Vec3& gpos, const real_t radius,
MaterialID material )
: GeomPrimitive( getStaticTypeID(), sid, uid, material ) // Initializing the base object
- , radius_(radius) // Radius of the cylinder // Length of the capsule
+ , radius_(radius) // Radius of the cylinder
{
//boundaries are always considered locally and have infinite mass
setGlobal( true );
@@ -66,11 +66,11 @@ CylindricalBoundary::CylindricalBoundary( id_t sid, id_t uid, const Vec3& gpos,
// Checking the radius
// Since the constructor is never directly called but only used in a small number
- // of functions that already check the capsule arguments, only asserts are used here to
+ // of functions that already check the cylinder arguments, only asserts are used here to
// double check the arguments.
- WALBERLA_ASSERT_GREATER( radius, real_t(0), "Invalid capsule radius" );
+ WALBERLA_ASSERT_GREATER( radius, real_t(0), "Invalid cylinder radius" );
- // Initializing the instantiated capsule
+ // Initializing the instantiated cylinder
gpos_ = gpos;
q_ = Quat(); // Setting the orientation
R_ = q_.toRotationMatrix(); // Setting the rotation matrix
diff --git a/src/pe/rigidbody/CylindricalBoundary.h b/src/pe/rigidbody/CylindricalBoundary.h
index 4c095c1a2..5d9b4c9d5 100644
--- a/src/pe/rigidbody/CylindricalBoundary.h
+++ b/src/pe/rigidbody/CylindricalBoundary.h
@@ -175,7 +175,7 @@ inline id_t CylindricalBoundary::getStaticTypeID()
//=================================================================================================
//*************************************************************************************************
-/*!\name Capsule operators */
+/*!\name Cylinder operators */
//@{
std::ostream& operator<<( std::ostream& os, const CylindricalBoundary& cb );
std::ostream& operator<<( std::ostream& os, CylindricalBoundaryID cb );
--
GitLab