diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 00000000000..37e3e4affac --- /dev/null +++ b/.codespellrc @@ -0,0 +1,3 @@ +[codespell] +skip = CHANGELOG.md +ignore-words-list = Sensable,SensAble,Datas,offsetT,dOut,*/extlibs/*,doubleClick,findOut,inForce,optionA \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9006eec30bc..85160f7960f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,7 +440,7 @@ if(SOFA_BUILD_RELEASE_PACKAGE) set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${EXTRA_INSTALL_COMMAND}") set(CPACK_NSIS_MENU_LINKS "https://www.sofa-framework.org/documentation/" "SOFA User Documentation" - "https://www.sofa-framework.org/api/" "SOFA Developper API" + "https://www.sofa-framework.org/api/" "SOFA Developer API" "https://github.com/sofa-framework/sofa/discussions" "SOFA Support") endif() ####################### diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d6fedeeb918..763be56f91f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,7 +108,7 @@ For more information on forks and pull request, check out [this GitHub guide](ht ### SOFA Developer Certificate Of Origin (DCO) -SOFA is using the [mechanism of the linux project](https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin) to track and secure all issues related to copyrights: the Developper Certificate of Origin (DCO). If you are contributing code or documentation to the SOFA project, and using the git signed-off-by mechanism, you are agreeing to this certificate. This DCO essentially means that: +SOFA is using the [mechanism of the linux project](https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin) to track and secure all issues related to copyrights: the Developer Certificate of Origin (DCO). If you are contributing code or documentation to the SOFA project, and using the git signed-off-by mechanism, you are agreeing to this certificate. This DCO essentially means that: - you offer the changes under the same license agreement as the project, and - you have the right to do that, diff --git a/GUIDELINES.md b/GUIDELINES.md index 3564407b756..01effe69eab 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -5,7 +5,7 @@ ### Base rules The base rules are in Google C++ Style Guide: https://google.github.io/styleguide/cppguide.html All rules below **replace** the corresponding base rules. -For any subject not mentionned below, please refer to the base. +For any subject not mentioned below, please refer to the base. ### Commit message A correct commit message must therefore be structured as: diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.cpp b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.cpp index b5140019a14..b40e59dee91 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.cpp +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.cpp @@ -220,7 +220,7 @@ ConstraintAnimationLoop::ConstraintAnimationLoop() : , d_doCollisionsFirst(initData(&d_doCollisionsFirst, false, "doCollisionsFirst","Compute the collisions first (to support penality-based contacts)")) , d_doubleBuffer( initData(&d_doubleBuffer, false, "doubleBuffer","Double the buffer dedicated to the constraint problem to make it accessible to another thread")) , d_scaleTolerance( initData(&d_scaleTolerance, true, "scaleTolerance","Scale the error tolerance with the number of constraints")) - , d_allVerified( initData(&d_allVerified, false, "allVerified","All contraints must be verified (each constraint's error < tolerance)")) + , d_allVerified( initData(&d_allVerified, false, "allVerified","All constraints must be verified (each constraint's error < tolerance)")) , d_sor( initData(&d_sor, 1.0_sreal, "sor","Successive Over Relaxation parameter (0-2)")) , d_schemeCorrection( initData(&d_schemeCorrection, false, "schemeCorrection","Apply new scheme where compliance is progressively corrected")) , d_realTimeCompensation( initData(&d_realTimeCompensation, false, "realTimeCompensation","If the total computational time T < dt, sleep(dt-T)")) diff --git a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h index cd07f88876b..c0198536671 100644 --- a/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h +++ b/Sofa/Component/AnimationLoop/src/sofa/component/animationloop/ConstraintAnimationLoop.h @@ -114,7 +114,7 @@ class SOFA_COMPONENT_ANIMATIONLOOP_API ConstraintAnimationLoop : public sofa::si Data d_doCollisionsFirst; ///< Compute the collisions first (to support penality-based contacts) Data d_doubleBuffer; ///< Double the buffer dedicated to the constraint problem to make it accessible to another thread Data d_scaleTolerance; ///< Scale the error tolerance with the number of constraints - Data d_allVerified; ///< All contraints must be verified (each constraint's error < tolerance) + Data d_allVerified; ///< All constraints must be verified (each constraint's error < tolerance) Data d_sor; ///< Successive Over Relaxation parameter (0-2) Data d_schemeCorrection; ///< Apply new scheme where compliance is progressively corrected Data d_realTimeCompensation; ///< If the total computational time T < dt, sleep(dt-T) diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPM.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPM.h index 193684bf086..f153307b905 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPM.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPM.h @@ -38,7 +38,7 @@ namespace sofa::component::collision::detection::algorithm /** *x and y value are used to identify this pair, the order is not important but the order of elem1_ and elem2_ is because - *when using intersect funcion we run inter->intersect(elem1,elem2,output), so the intersect method must handle the order you give. + *when using intersect function we run inter->intersect(elem1,elem2,output), so the intersect method must handle the order you give. */ CollidingPair(const core::CollisionElementIterator & elem1_,const core::CollisionElementIterator & elem2_,core::collision::ElementIntersector * /*inter*/) : elem1(elem1_),elem2(elem2_) diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPipeline.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPipeline.cpp index 309eafe5ea2..a123ff5cd23 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPipeline.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/CollisionPipeline.cpp @@ -58,7 +58,7 @@ const int CollisionPipeline::defaultDepthValue = 6; CollisionPipeline::CollisionPipeline() : d_doPrintInfoMessage(initData(&d_doPrintInfoMessage, false, "verbose", - "Display extra informations at each computation step. (default=false)")) + "Display extra information at each computation step. (default=false)")) , d_doDebugDraw(initData(&d_doDebugDraw, false, "draw", "Draw the detected collisions. (default=false)")) diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.cpp index dd1ebc83b78..ffec72fc398 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.cpp @@ -250,10 +250,10 @@ void DirectSAPNarrowPhase::narrowCollisionDetectionFromSortedEndPoints() SCOPED_TIMER_VARNAME(scopeTimer, "Direct SAP intersection"); int nbInvestigatedPairs{ 0 }; - std::list activeBoxes;//active boxes are the one that we encoutered only their min (end point), so if there are two boxes b0 and b1, + std::list activeBoxes;//active boxes are the one that we encountered only their min (end point), so if there are two boxes b0 and b1, //if we encounter b1_min as b0_min < b1_min, on the current axis, the two boxes intersect : b0_min--------------------b0_max // b1_min---------------------b1_max - //once we encouter b0_max, b0 will not intersect with nothing (trivial), so we delete it from active_boxes. + //once we encounter b0_max, b0 will not intersect with nothing (trivial), so we delete it from active_boxes. //so the rule is : -every time we encounter a box min end point, we check if it is overlapping with other active_boxes and add the owner (a box) of this end point to // the active boxes. // -every time we encounter a max end point of a box, we are sure that we encountered min end point of a box because _end_points is sorted, diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h index eff32606c88..ae4fe92de14 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/DirectSAPNarrowPhase.h @@ -38,7 +38,7 @@ namespace sofa::component::collision::detection::algorithm /** * This class is an implementation of sweep and prune in its "direct" version, i.e. at each step - * it sorts all the primitives along an axis (not checking the moving ones) and computes overlaping pairs without + * it sorts all the primitives along an axis (not checking the moving ones) and computes overlapping pairs without * saving it. But the memory used to save these primitives is created just once, the first time we add CollisionModels. */ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : public core::collision::NarrowPhaseDetection @@ -53,7 +53,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API DirectSAPNarrowPhase : pu /** \brief Returns the axis number which have the greatest variance for the primitive end points. * * This axis is used when updating and sorting end points. The greatest variance means - * that this axis have the most chance to eliminate a maximum of not overlaping SAPBox pairs + * that this axis have the most chance to eliminate a maximum of not overlapping SAPBox pairs * because along this axis, SAPBoxes are the sparsest. */ int greatestVarianceAxis() const; diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp index b1fa60cc423..43d3f054c1e 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.cpp @@ -371,10 +371,10 @@ void IncrSAP::boxPrune(){ SCOPED_TIMER("Box Prune SAP intersection"); - std::deque active_boxes; // active boxes are the one that we encoutered only their min (end point), so if there are two boxes b0 and b1, + std::deque active_boxes; // active boxes are the one that we encountered only their min (end point), so if there are two boxes b0 and b1, // if we encounter b1_min as b0_min < b1_min, on the current axis, the two boxes intersect : b0_min--------------------b0_max // b1_min---------------------b1_max - // once we encouter b0_max, b0 will not intersect with nothing (trivial), so we delete it from active_boxes. + // once we encounter b0_max, b0 will not intersect with nothing (trivial), so we delete it from active_boxes. // so the rule is : - every time we encounter a box min end point, we check if it is overlapping with other active_boxes and add the owner (a box) of this end point to // the active boxes. // - every time we encounter a max end point of a box, we are sure that we encountered min end point of a box because _end_points is sorted, diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h index e83d29d7dd8..3a787ff9059 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/IncrSAP.h @@ -178,7 +178,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP : void updateEndPoints(); /** - * Sets the end points ID, i.e. each end point in the list after this mehod have its position (ID) updated. + * Sets the end points ID, i.e. each end point in the list after this method have its position (ID) updated. */ void setEndPointsID(); @@ -263,7 +263,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_ALGORITHM_API IncrSAP : void addCollisionModel (core::CollisionModel *cm) override; - // Unuseful methods because all is done in addCollisionModel + // Useless methods because all is done in addCollisionModel void addCollisionPair (const std::pair& ) override {} void addCollisionPairs (const type::vector >&) override {} diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceDetection.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceDetection.h index e0220909a1d..6a2d5e1bf58 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceDetection.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceDetection.h @@ -31,7 +31,7 @@ namespace sofa::component::collision::detection::algorithm /** * \brief It is a Ray Trace based collision detection algorithm * - * For each point in one object, we trace a ray following the oposite of the point's normal + * For each point in one object, we trace a ray following the opposite of the point's normal * up to find a triangle in the other object. Both triangles are tested to evaluate if they are in * colliding state. It must be used with a TriangleOctreeModel,as an octree is used to traverse the object. */ diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.cpp b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.cpp index 30dadd9682a..e48a308c68b 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.cpp @@ -52,7 +52,7 @@ void RayTraceNarrowPhase::findPairsVolume (CubeCollisionModel * cm1, CubeCollisi return; - /*construct the octree of both models, when it still doesn't exisits */ + /*construct the octree of both models, when it still doesn't exists */ if (!tm1->octreeRoot) { diff --git a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h index ac68c919558..4208f6570c0 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h +++ b/Sofa/Component/Collision/Detection/Algorithm/src/sofa/component/collision/detection/algorithm/RayTraceNarrowPhase.h @@ -35,7 +35,7 @@ namespace sofa::component::collision::detection::algorithm /** * \brief It is a Ray Trace based collision detection algorithm * - * For each point in one object, we trace a ray following the oposite of the point's normal + * For each point in one object, we trace a ray following the opposite of the point's normal * up to find a triangle in the other object. Both triangles are tested to evaluate if they are in * colliding state. It must be used with a TriangleOctreeModel,as an octree is used to traverse the object. */ diff --git a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp index 3c0d68f66c2..0adc21e696f 100644 --- a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp +++ b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp @@ -269,7 +269,7 @@ TEST_F(TestCollisionPipeline, checkCollisionPipelineWithMonkeyValueForDepth_Open // Check the returned value. if(this->checkCollisionPipelineWithMonkeyValueForDepth(depthValue) != depthValue) { - ADD_FAILURE() << "User provided depth parameter value '" << depthValue << "' has been un-expectedly overriden." ; + ADD_FAILURE() << "User provided depth parameter value '" << depthValue << "' has been un-expectedly overridden." ; } } else diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp index 00c2405953e..12c7e592cd8 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.cpp @@ -27,7 +27,7 @@ namespace sofa::component::collision::detection::intersection using namespace sofa::component::collision::geometry; BaseProximityIntersection::BaseProximityIntersection() - : d_alarmDistance(initData(&d_alarmDistance, 1.0_sreal, "alarmDistance", "Distance above which the intersection computations ignores the promixity pair. This distance can also be used in some broad phase algorithms to reduce the search area")) + : d_alarmDistance(initData(&d_alarmDistance, 1.0_sreal, "alarmDistance", "Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area")) , d_contactDistance(initData(&d_contactDistance, 0.5_sreal, "contactDistance", "Distance below which a contact is created")) { d_alarmDistance.setRequired(true); diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h index b5eef9eaeae..8dbe24ea612 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/BaseProximityIntersection.h @@ -47,7 +47,7 @@ class SOFA_COMPONENT_COLLISION_DETECTION_INTERSECTION_API BaseProximityIntersect sofa::core::objectmodel::RenamedData contactDistance; - Data d_alarmDistance; ///< Distance above which the intersection computations ignores the promixity pair. This distance can also be used in some broad phase algorithms to reduce the search area + Data d_alarmDistance; ///< Distance above which the intersection computations ignores the proximity pair. This distance can also be used in some broad phase algorithms to reduce the search area Data d_contactDistance; ///< Distance below which a contact is created protected: BaseProximityIntersection(); diff --git a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl index ff6a9e689a0..ad7c8db5892 100644 --- a/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl +++ b/Sofa/Component/Collision/Detection/Intersection/src/sofa/component/collision/detection/intersection/MeshDiscreteIntersection.inl @@ -123,7 +123,7 @@ int MeshDiscreteIntersection::computeIntersection(collision::geometry::TSphere= 0) if ( (SAMESIDE(projPoint,p0,p1,p2) && SAMESIDE(projPoint,p1,p0,p2) && SAMESIDE(projPoint,p2,p0,p1))) diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/CubeModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/CubeModel.h index 8ebabcae79b..2940e94e79e 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/CubeModel.h +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/CubeModel.h @@ -57,9 +57,9 @@ class SOFA_COMPONENT_COLLISION_GEOMETRY_API CubeCollisionModel : public core::Co { sofa::type::Vec3 minBBox, maxBBox; std::pair subcells; - std::pair children; ///< Note that children is only meaningfull if subcells in empty + std::pair children; ///< Note that children is only meaningful if subcells in empty - // additional datas for implementing Volino's method for efficient cloth self collision + // additional data for implementing Volino's method for efficient cloth self collision sofa::type::Vec3 coneAxis; SReal coneAngle; }; diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleModel.inl b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleModel.inl index 040d3622d65..69cb8ec2998 100644 --- a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleModel.inl +++ b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/TriangleModel.inl @@ -228,7 +228,7 @@ void TriangleCollisionModel::computeBoundingTree(int maxDepth) if (!isMoving() && !cubeModel->empty() && !m_needsUpdate) return; // No need to recompute BBox if immobile nor if mesh didn't change. - // set to false to avoid excesive loop + // set to false to avoid excessive loop m_needsUpdate=false; type::Vec3 minElem, maxElem; diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp index 605773cd741..5cf07396523 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/CollisionResponse.cpp @@ -172,7 +172,7 @@ void CollisionResponse::createNewContacts(const core::collision::ContactManager: if (contact == nullptr) { - //contact couln't be created: write an error and collision detection output is no longer considered + //contact couldn't be created: write an error and collision detection output is no longer considered contactCreationError(errorStream, model1, model2, responseUsed); contactMap.erase(contactIt); } diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.h b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.h index 5b2ade19fe0..1ad75539831 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.h +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.h @@ -127,7 +127,7 @@ class PenalityContactForceField : public core::behavior::PairInteractionForceFie const type::vector< Contact >& getContact() const { return contacts.getValue();} - // -- tool grabing utility + // -- tool grabbing utility void grabPoint( const core::behavior::MechanicalState *tool, const type::vector< sofa::Index > &index, type::vector< std::pair< core::objectmodel::BaseObject*, type::Vec3f> > &result, diff --git a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.inl b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.inl index 3be0f652619..1a342383a81 100644 --- a/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.inl +++ b/Sofa/Component/Collision/Response/Contact/src/sofa/component/collision/response/contact/PenalityContactForceField.inl @@ -119,7 +119,7 @@ void PenalityContactForceField::addDForce(const sofa::core::Mechanica { Coord du = dx2[c.m2]-dx1[c.m1]; Real dpen = - du*c.norm; - //if (c.pen < 0) dpen += c.pen; // start penality at distance 0 + //if (c.pen < 0) dpen += c.pen; // start penalty at distance 0 Real dfN = c.ks * dpen * (Real)kFactor; Deriv dforce = -c.norm*dfN; df1[c.m1]+=dforce; diff --git a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h index 8bb32bd00ac..e89bb076d46 100644 --- a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h +++ b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/MeshPrimitiveCreator.h @@ -64,7 +64,7 @@ inline sofa::component::collision::geometry::TriangleCollisionModel& dvelocities = *triDOF->write(sofa::core::VecId::velocity()); MechanicalObject3::VecDeriv& velocities = *dvelocities.beginEdit(); @@ -89,7 +89,7 @@ inline sofa::component::collision::geometry::TriangleCollisionModeladdObject(triCollisionModel); - //editting the OBBModel + //editing the OBBModel triCollisionModel->init(); return triCollisionModel; diff --git a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h index 6f392d05780..fb9f38075ef 100644 --- a/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h +++ b/Sofa/Component/Collision/Testing/src/sofa/component/collision/testing/SpherePrimitiveCreator.h @@ -87,7 +87,7 @@ inline sofa::component::collision::geometry::SphereCollisionModel& dvelocities = *sphereDOF->write(sofa::core::VecId::velocity()); MechanicalObjectRigid3::VecDeriv& velocities = *dvelocities.beginEdit(); @@ -130,7 +130,7 @@ inline sofa::component::collision::geometry::SphereCollisionModel& dvelocities = *sphereDOF->write(sofa::core::VecId::velocity()); MechanicalObject3::VecDeriv& velocities = *dvelocities.beginEdit(); @@ -144,7 +144,7 @@ inline sofa::component::collision::geometry::SphereCollisionModel::SPtr sphereCollisionModel = New>(); sphere->addObject(sphereCollisionModel); - //editting the RigidSphereModel + //editing the RigidSphereModel sphereCollisionModel->init(); sofa::component::collision::geometry::SphereCollisionModel::VecReal& vecRad = *(sphereCollisionModel->d_radius.beginEdit()); diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.inl b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.inl index 4abdd39f127..c29e6e20a98 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.inl +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/LinearSolverConstraintCorrection.inl @@ -614,7 +614,7 @@ void LinearSolverConstraintCorrection::addConstraintDisplacement(SRea const auto positionIntegrationFactor = l_ODESolver->getPositionIntegrationFactor(); - // TODO => optimisation => for each bloc store J[bloc,dof] + // TODO => optimisation => for each block store J[block,dof] for (int i = begin; i <= end; i++) { MatrixDerivRowConstIterator rowIt = constraints.readLine(i); @@ -674,7 +674,7 @@ void LinearSolverConstraintCorrection::setConstraintDForce(SReal* df, } } - // course on indices of the dofs involved invoved in the bloc // + // course on indices of the dofs involved invoved in the block // auto it_dof(Vec_I_list_dof[last_force].cbegin()), it_end(Vec_I_list_dof[last_force].cend()); for(; it_dof!=it_end; ++it_dof) { diff --git a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl index e66fa21f205..5a500629730 100644 --- a/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl +++ b/Sofa/Component/Constraint/Lagrangian/Correction/src/sofa/component/constraint/lagrangian/correction/PrecomputedConstraintCorrection.inl @@ -261,7 +261,7 @@ void PrecomputedConstraintCorrection::bwdInit() // Buffer Allocation invM->data = new Real[nbRows * nbCols]; - // for the intial computation, the gravity has to be put at 0 + // for the initial computation, the gravity has to be put at 0 const sofa::type::Vec3& gravity = this->getContext()->getGravity(); static constexpr sofa::type::Vec3 gravity_zero(0_sreal, 0_sreal, 0_sreal); @@ -397,7 +397,7 @@ void PrecomputedConstraintCorrection::bwdInit() cgLinearSolver->d_smallDenominatorThreshold.setValue(buf_threshold); } - // Retore velocity + // Restore velocity for (unsigned int i = 0; i < velocity.size(); i++) velocity[i] = prev_velocity[i]; diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralConstraintResolution.h b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralConstraintResolution.h index 075c9232388..10af8e5ab20 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralConstraintResolution.h +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralConstraintResolution.h @@ -90,7 +90,7 @@ class BilateralConstraintResolution3Dof : public ConstraintResolution assert(canInvert); SOFA_UNUSED(canInvert); - // invW is unsused in this scope, remove the warning: + // invW is unused in this scope, remove the warning: SOFA_UNUSED(invW); if(_f) diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl index df936e58a85..ad18a6ed7f7 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralLagrangianConstraint.inl @@ -404,7 +404,7 @@ void BilateralLagrangianConstraint::draw(const core::visual::VisualPa } //TODO(dmarchal): implementing keyboard interaction behavior directly in a component is not a valid -//design for a component. Interaction should be defered to an independent Component implemented in the SofaInteraction +//design for a component. Interaction should be deferred to an independent Component implemented in the SofaInteraction //a second possibility is to implement this behavir using script. template void BilateralLagrangianConstraint::handleEvent(Event *event) diff --git a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl index ff7dbbe72c9..5112e0b46cc 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl +++ b/Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/UnilateralLagrangianConstraint.inl @@ -245,7 +245,7 @@ void UnilateralLagrangianConstraint::getPositionViolation(linearalgeb v->set(c.id, dfree); - c.dfree = dfree; // PJ : For isActive() method. Don't know if it's still usefull. + c.dfree = dfree; // PJ : For isActive() method. Don't know if it's still useful. if (c.mu > 0.0) { diff --git a/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp b/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp index 874b85c78e3..7b89636d391 100644 --- a/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp @@ -127,7 +127,7 @@ struct BilateralInteractionLangrangianConstraint_test : public NumericTest<> } - /// This component requires to be used in conjonction with MechanicalObjects. + /// This component requires to be used in conjunction with MechanicalObjects. void checkMstateRequiredAssumption(){ EXPECT_MSG_EMIT(Error) ; @@ -233,14 +233,14 @@ bool BilateralInteractionLangrangianConstraint_test::test_Vec3Constra return false; } -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(BilateralInteractionLangrangianConstraint_test, DataTypes); //TODO(dmarchal): Needs a serious refactor !!! diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.h index 82aee17d67b..626eb74d2ec 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.h +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/ConstraintSolverImpl.h @@ -77,7 +77,7 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API ConstraintSolverImpl : pub virtual ConstraintProblem* getConstraintProblem() = 0; /// Do not use the following LCPs until the next call to this function. - /// This is used to prevent concurent access to the LCP when using a LCPForceFeedback through an haptic thread. + /// This is used to prevent concurrent access to the LCP when using a LCPForceFeedback through an haptic thread. virtual void lockConstraintProblem(sofa::core::objectmodel::BaseObject* from, ConstraintProblem* p1, ConstraintProblem* p2=nullptr) = 0; void removeConstraintCorrection(core::behavior::BaseConstraintCorrection *s) override; diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintProblem.cpp b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintProblem.cpp index 4a666047f24..3729f48d491 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintProblem.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintProblem.cpp @@ -560,7 +560,7 @@ void GenericConstraintProblem::NNCG(GenericConstraintSolver* solver, int iterati sofa::type::vector tabErrors(dimension); { - // peform one iteration of ProjectedGaussSeidel + // perform one iteration of ProjectedGaussSeidel bool constraintsAreVerified = true; std::copy_n(force, dimension, std::begin(m_lam)); diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp index 7a60a110c4e..e76b5eac8b9 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp @@ -66,7 +66,7 @@ GenericConstraintSolver::GenericConstraintSolver() , d_tolerance(initData(&d_tolerance, 0.001_sreal, "tolerance", "residual error threshold for termination of the Gauss-Seidel algorithm")) , d_sor(initData(&d_sor, 1.0_sreal, "sor", "Successive Over Relaxation parameter (0-2)")) , d_scaleTolerance(initData(&d_scaleTolerance, true, "scaleTolerance", "Scale the error tolerance with the number of constraints")) - , d_allVerified(initData(&d_allVerified, false, "allVerified", "All contraints must be verified (each constraint's error < tolerance)")) + , d_allVerified(initData(&d_allVerified, false, "allVerified", "All constraints must be verified (each constraint's error < tolerance)")) , d_newtonIterations(initData(&d_newtonIterations, 100, "newtonIterations", "Maximum iteration number of Newton (for the NonsmoothNonlinearConjugateGradient solver only)")) , d_multithreading(initData(&d_multithreading, false, "multithreading", "Build compliances concurrently")) , d_computeGraphs(initData(&d_computeGraphs, false, "computeGraphs", "Compute graphs of errors and forces during resolution")) diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h index 0eda9924d74..7d752048930 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h @@ -111,7 +111,7 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver : Data d_tolerance; ///< residual error threshold for termination of the Gauss-Seidel algorithm Data d_sor; ///< Successive Over Relaxation parameter (0-2) Data d_scaleTolerance; ///< Scale the error tolerance with the number of constraints - Data d_allVerified; ///< All contraints must be verified (each constraint's error < tolerance) + Data d_allVerified; ///< All constraints must be verified (each constraint's error < tolerance) Data d_newtonIterations; ///< Maximum iteration number of Newton (for the NonsmoothNonlinearConjugateGradient solver only) Data d_multithreading; ///< Build compliances concurrently Data d_computeGraphs; ///< Compute graphs of errors and forces during resolution diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp index 88176a20a26..42b9179f220 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.cpp @@ -948,7 +948,7 @@ int LCPConstraintSolver::nlcp_gaussseidel_unbuilt(SReal *dfree, SReal *f, std::v ///////// verifier si Delta force vaut 0 => pas la peine d'ajouter la force - // set Delta force on object 1 for evaluating the followings displacement + // set Delta force on object 1 for evaluating the following displacement if(update) { diff --git a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h index e2a5177e57c..d4ba0ee2681 100644 --- a/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h +++ b/Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/LCPConstraintSolver.h @@ -158,7 +158,7 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API LCPConstraintSolver : publ Data d_showLevelTranslation; ///< Translation between levels ConstraintProblem* getConstraintProblem() override; - void lockConstraintProblem(sofa::core::objectmodel::BaseObject* from, ConstraintProblem* p1, ConstraintProblem* p2=nullptr) override; ///< Do not use the following LCPs until the next call to this function. This is used to prevent concurent access to the LCP when using a LCPForceFeedback through an haptic thread + void lockConstraintProblem(sofa::core::objectmodel::BaseObject* from, ConstraintProblem* p1, ConstraintProblem* p2=nullptr) override; ///< Do not use the following LCPs until the next call to this function. This is used to prevent concurrent access to the LCP when using a LCPForceFeedback through an haptic thread private: void computeInitialGuess(); diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h index 8348c4b5884..872ae61a5af 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/DirectionProjectiveConstraint.h @@ -41,7 +41,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class DirectionProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.h index 795e9957474..79770550c4d 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.h @@ -39,7 +39,7 @@ using sofa::core::topology::BaseMeshTopology; using sofa::core::behavior::MultiMatrixAccessor; using sofa::core::behavior::ProjectiveConstraintSet; -/// This class can be overriden if needed for additionnal storage within template specilizations. +/// This class can be overridden if needed for additional storage within template specializations. template class FixedPlaneProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h index d622e3a926d..f10acb6c553 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.h @@ -36,7 +36,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class FixedProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.inl index 30a13f89d8f..7c4cb684473 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedProjectiveConstraint.inl @@ -230,7 +230,7 @@ void FixedProjectiveConstraint::projectJacobianMatrix(const core::Mec // projectVelocity applies the same changes on velocity vector as projectResponse on position vector : // Each fixed point received a null velocity vector. -// When a new fixed point is added while its velocity vector is already null, projectVelocity is not usefull. +// When a new fixed point is added while its velocity vector is already null, projectVelocity is not useful. // But when a new fixed point is added while its velocity vector is not null, it's necessary to fix it to null or // to set the projectVelocity option to True. If not, the fixed point is going to drift. template @@ -242,7 +242,7 @@ void FixedProjectiveConstraint::projectVelocity(const core::Mechanica helper::WriteAccessor res (vData ); - if ( d_fixAll.getValue() ) // fix everyting + if ( d_fixAll.getValue() ) // fix everything { for(Size i=0; i class FixedTranslationProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl index 03717a81c08..6a844cd338b 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/HermiteSplineProjectiveConstraint.inl @@ -37,7 +37,7 @@ HermiteSplineProjectiveConstraint::HermiteSplineProjectiveConstraint( , d_x0(initData(&d_x0, "X0", "first control point") ) , d_dx0(initData(&d_dx0, "dX0", "first control tangente") ) , d_x1(initData(&d_x1, "X1", "second control point") ) - , d_dx1(initData(&d_dx1, "dX1", "sceond control tangente") ) + , d_dx1(initData(&d_dx1, "dX1", "second control tangente") ) , d_sx0(initData(&d_sx0, "SX0", "first interpolation vector") ) , d_sx1(initData(&d_sx1, "SX1", "second interpolation vector") ) , l_topology(initLink("topology", "link to the topology container")) diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h index 96d9edc704e..0475832b1bb 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LineProjectiveConstraint.h @@ -40,7 +40,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class LineProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h index 10655b70d13..c6434edab57 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearMovementProjectiveConstraint.h @@ -107,7 +107,7 @@ public : /// the key times surrounding the current simulation time (for interpolation) Real prevT, nextT; - ///the motions corresponding to the surrouding key times + ///the motions corresponding to the surrounding key times Deriv prevM, nextM; ///initial constrained DOFs position VecCoord x0; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.h index 74c67b83997..6e3a71e9329 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/LinearVelocityProjectiveConstraint.h @@ -68,12 +68,12 @@ public : Data > d_keyTimes; /// the motions corresponding to the key frames Data d_keyVelocities; - /// the coordinates on which to applay velocities + /// the coordinates on which to apply velocities SetIndex d_coordinates; /// the key times surrounding the current simulation time (for interpolation) Real prevT, nextT; - ///the velocities corresponding to the surrouding key times + ///the velocities corresponding to the surrounding key times Deriv prevV, nextV; ///position at the initial step for constrained DOFs position VecCoord x0; diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl index ed05ccf9933..361c55dc11f 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialFixedProjectiveConstraint.inl @@ -97,7 +97,7 @@ void PartialFixedProjectiveConstraint::projectResponse(const core::Me // projectVelocity applies the same changes on velocity vector as projectResponse on position vector : // Each fixed point received a null velocity vector. -// When a new fixed point is added while its velocity vector is already null, projectVelocity is not usefull. +// When a new fixed point is added while its velocity vector is already null, projectVelocity is not useful. // But when a new fixed point is added while its velocity vector is not null, it's necessary to fix it to null or // to set the projectVelocity option to True. If not, the fixed point is going to drift. template @@ -112,7 +112,7 @@ void PartialFixedProjectiveConstraint::projectVelocity(const core::Me if ( this->d_fixAll.getValue() ) { - // fix everyting + // fix everything for (Size i = 0; i < res.size(); i++) { for (unsigned int c = 0; c < NumDimensions; ++c) diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h index 6ac522d1f95..a2eb576ae4e 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.h @@ -127,16 +127,16 @@ public : /// the key times surrounding the current simulation time (for interpolation) Real prevT, nextT; - ///the motions corresponding to the surrouding key times + ///the motions corresponding to the surrounding key times Deriv prevM, nextM; ///initial constrained DOFs position VecCoord x0; core::objectmodel::Data d_linearMovementBetweenNodesInIndices; ///< Take into account the linear movement between the constrained points core::objectmodel::Data d_mainIndice; ///< The main indice node in the list of constrained nodes, it defines how to apply the linear movement between this constrained nodes - core::objectmodel::Data d_minDepIndice; ///< The indice node in the list of constrained nodes, which is imposed the minimum displacment - core::objectmodel::Data d_maxDepIndice; ///< The indice node in the list of constrained nodes, which is imposed the maximum displacment - core::objectmodel::Data > d_imposedDisplacmentOnMacroNodes; ///< The imposed displacment on macro nodes + core::objectmodel::Data d_minDepIndice; ///< The indice node in the list of constrained nodes, which is imposed the minimum displacement + core::objectmodel::Data d_maxDepIndice; ///< The indice node in the list of constrained nodes, which is imposed the maximum displacement + core::objectmodel::Data > d_imposedDisplacmentOnMacroNodes; ///< The imposed displacement on macro nodes ///< and u1 u2 u3 u4 u5 u6 u7 u8 for 3d case Data d_X0; ///< Size of specimen in X-direction Data d_Y0; ///< Size of specimen in Y-direction diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl index c79596e08ba..d42c03b63de 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PartialLinearMovementProjectiveConstraint.inl @@ -45,9 +45,9 @@ PartialLinearMovementProjectiveConstraint::PartialLinearMovementProje , d_showMovement( initData(&d_showMovement, (bool)false, "showMovement", "Visualization of the movement to be applied to constrained dofs.")) , d_linearMovementBetweenNodesInIndices( initData(&d_linearMovementBetweenNodesInIndices, (bool)false, "linearMovementBetweenNodesInIndices", "Take into account the linear movement between the constrained points")) , d_mainIndice( initData(&d_mainIndice, "mainIndice", "The main indice node in the list of constrained nodes, it defines how to apply the linear movement between this constrained nodes ")) - , d_minDepIndice( initData(&d_minDepIndice, "minDepIndice", "The indice node in the list of constrained nodes, which is imposed the minimum displacment ")) - , d_maxDepIndice( initData(&d_maxDepIndice, "maxDepIndice", "The indice node in the list of constrained nodes, which is imposed the maximum displacment ")) - , d_imposedDisplacmentOnMacroNodes( initData(&d_imposedDisplacmentOnMacroNodes,"imposedDisplacmentOnMacroNodes","The imposed displacment on macro nodes") ) + , d_minDepIndice( initData(&d_minDepIndice, "minDepIndice", "The indice node in the list of constrained nodes, which is imposed the minimum displacement ")) + , d_maxDepIndice( initData(&d_maxDepIndice, "maxDepIndice", "The indice node in the list of constrained nodes, which is imposed the maximum displacement ")) + , d_imposedDisplacmentOnMacroNodes( initData(&d_imposedDisplacmentOnMacroNodes,"imposedDisplacmentOnMacroNodes","The imposed displacement on macro nodes") ) , d_X0 ( initData ( &d_X0, Real(0.0),"X0","Size of specimen in X-direction" ) ) , d_Y0 ( initData ( &d_Y0, Real(0.0),"Y0","Size of specimen in Y-direction" ) ) , d_Z0 ( initData ( &d_Z0, Real(0.0),"Z0","Size of specimen in Z-direction" ) ) diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h index 4625fcd2a61..e7311abd86a 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PlaneProjectiveConstraint.h @@ -40,7 +40,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class PlaneProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h index 255d2b7dd57..a843bc0f1fa 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PointProjectiveConstraint.h @@ -38,7 +38,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class PointProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h index 167aa1c2954..7f350a7c256 100644 --- a/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h +++ b/Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/PositionBasedDynamicsProjectiveConstraint.h @@ -38,7 +38,7 @@ namespace sofa::component::constraint::projective { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class PositionBasedDynamicsProjectiveConstraintInternalData { diff --git a/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp index 43421246e99..98be7bad2e5 100644 --- a/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp @@ -190,13 +190,13 @@ struct AffineMovementProjectiveConstraint_test : public BaseSimulationTest, Nume }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(AffineMovementProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( AffineMovementProjectiveConstraint_test , testValue ) diff --git a/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp index ebafa65a07f..e4663da89ac 100644 --- a/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp @@ -229,13 +229,13 @@ struct DirectionProjectiveConstraint_test : public BaseSimulationTest, NumericTe }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(DirectionProjectiveConstraint_test, DataTypes); // first test case diff --git a/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp index 5e5510938e9..cc7083b929a 100644 --- a/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp @@ -127,15 +127,15 @@ struct FixedPlaneProjectiveConstraint_test : public BaseSimulationTest } }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec3Types, defaulttype::Vec6Types, defaulttype::Rigid3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(FixedPlaneProjectiveConstraint_test, DataTypes); // test cases diff --git a/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp index 8267b022412..adee116e4ec 100644 --- a/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp @@ -237,7 +237,7 @@ struct FixedProjectiveConstraint_test : public BaseTest }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec1Types, @@ -246,9 +246,9 @@ typedef Types< defaulttype::Vec6Types, defaulttype::Rigid2Types, defaulttype::Rigid3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(FixedProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( FixedProjectiveConstraint_test , testValueImplicitWithCG ) diff --git a/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp index d150397e0df..61a72af32ff 100644 --- a/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp @@ -214,13 +214,13 @@ const PointSetTopologyContainer::SPtr topology = core::objectmodel::New DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(LineProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( LineProjectiveConstraint_test , oneConstrainedParticle ) diff --git a/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp index f91407fbbe9..10f6897e0c2 100644 --- a/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp @@ -124,7 +124,7 @@ struct PartialFixedProjectiveConstraint_test : public BaseSimulationTest } }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec1Types, @@ -133,9 +133,9 @@ typedef Types< defaulttype::Vec6Types, defaulttype::Rigid2Types, defaulttype::Rigid3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(PartialFixedProjectiveConstraint_test, DataTypes); // test cases diff --git a/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp index 1d5fc5b0abd..05be6be816f 100644 --- a/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp @@ -213,13 +213,13 @@ const PointSetTopologyContainer::SPtr topology = core::objectmodel::New DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(PlaneProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( PlaneProjectiveConstraint_test , oneConstrainedParticle ) diff --git a/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp index a6ec19a9cea..5151e9f7f29 100644 --- a/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp +++ b/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp @@ -217,13 +217,13 @@ struct PointProjectiveConstraint_test : public BaseSimulationTest, NumericTest DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(PointProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( PointProjectiveConstraint_test , oneConstrainedParticle ) diff --git a/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp b/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp index c71e26a84be..5338843d1a6 100644 --- a/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp +++ b/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp @@ -184,12 +184,12 @@ struct TetrahedronDiffusionFEMForceField_test : public BaseSimulationTest }; -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; -typedef ::testing::Types > TestTypes; // the types to instanciate. +typedef ::testing::Types > TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(TetrahedronDiffusionFEMForceField_test, TestTypes); // test case diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.h b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.h index 9efe8a5029d..95839123e96 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.h +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.h @@ -39,8 +39,8 @@ namespace sofa::component::engine::analyze /** * This class groups points into overlapping clusters according to a user defined number of clusters and radius - * It takes input positions (and optionally a meshtopology if geodesic distances are prefered) - * ouput clusters can then be fed to + * It takes input positions (and optionally a meshtopology if geodesic distances are preferred) + * output clusters can then be fed to * - shape matching engine * - blendSkinningMapping * @@ -75,7 +75,7 @@ class ClusteringEngine : public core::DataEngine void draw(const core::visual::VisualParams* vparams) override; - Data d_useTopo; ///< Use avalaible topology to compute neighborhood. + Data d_useTopo; ///< Use available topology to compute neighborhood. //Data maxIter; Data d_radius; ///< Neighborhood range. diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.inl b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.inl index 81f14baa603..347e2887eb3 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.inl +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ClusteringEngine.inl @@ -44,7 +44,7 @@ using sofa::helper::WriteOnlyAccessor; template ClusteringEngine::ClusteringEngine() - : d_useTopo(initData(&d_useTopo, true, "useTopo", "Use avalaible topology to compute neighborhood.")) + : d_useTopo(initData(&d_useTopo, true, "useTopo", "Use available topology to compute neighborhood.")) , d_radius(initData(&d_radius, (Real)1.0, "radius", "Neighborhood range.")) , d_fixedRadius(initData(&d_fixedRadius, (Real)1.0, "fixedRadius", "Neighborhood range (for non mechanical particles).")) , d_nbClusters(initData(&d_nbClusters, (int)-1, "number", "Number of clusters (-1 means that all input points are selected).")) diff --git a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h index 1c91abc2187..d0159ca3e35 100644 --- a/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h +++ b/Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/Distances.h @@ -45,7 +45,7 @@ namespace sofa::component::engine::analyze { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class DistancesInternalData { diff --git a/Sofa/Component/Engine/Analyze/tests/Engine.Analyze_DataUpdate_test.cpp b/Sofa/Component/Engine/Analyze/tests/Engine.Analyze_DataUpdate_test.cpp index a69ee0a81c1..6681222877e 100644 --- a/Sofa/Component/Engine/Analyze/tests/Engine.Analyze_DataUpdate_test.cpp +++ b/Sofa/Component/Engine/Analyze/tests/Engine.Analyze_DataUpdate_test.cpp @@ -44,9 +44,9 @@ typedef ::testing::Types< //TestDataEngine< component::engine::analyze::ShapeMatching >, // getObject pb -> require a scene TestDataEngine< component::engine::analyze::ClusteringEngine >, TestDataEngine< component::engine::analyze::SumEngine > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(DataEngine_test, TestTypes); //// test number of call to DataEngine::update diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateCylinder.inl b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateCylinder.inl index aae72476488..6a0dd45af0b 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateCylinder.inl +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateCylinder.inl @@ -391,7 +391,7 @@ void GenerateCylinder::doUpdate() out.push_back(pos); bezierTetrahedronWeight.push_back((Real)(1+2*ctheta)/3.0f); } else { - // this is the affine case. The triangular control points are simply built from a tesselation of the triangles + // this is the affine case. The triangular control points are simply built from a tessellation of the triangles for (j=1;j<(degreeTetrahedron-1);++j) { for (k=1;k<(degreeTetrahedron-j);++k) { pos= out[tr[0]]*k/degreeTetrahedron+(Real)(degreeTetrahedron-j-k)*out[tr[1]]/degreeTetrahedron+ diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h index d9c97c62ce5..db479ad9437 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/GenerateRigidMass.h @@ -89,7 +89,7 @@ class GenerateRigidMass : public core::DataEngine type::fixed_array afIntegral; public: - /// Implementing the GetCustomTemplateName is mandatory to have a custom template name paremters + /// Implementing the GetCustomTemplateName is mandatory to have a custom template name parameters /// instead of the default one generated automatically by the SOFA_CLASS() macro. static std::string GetCustomTemplateName(); diff --git a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MergePoints.cpp b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MergePoints.cpp index 249bce47218..6527093512d 100644 --- a/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MergePoints.cpp +++ b/Sofa/Component/Engine/Generate/src/sofa/component/engine/generate/MergePoints.cpp @@ -28,7 +28,7 @@ namespace sofa::component::engine::generate void registerMergePoints(sofa::core::ObjectFactory* factory) { - factory->registerObjects(core::ObjectRegistrationData("Merge 2 cordinate vectors.") + factory->registerObjects(core::ObjectRegistrationData("Merge 2 coordinate vectors.") .add< MergePoints >(true) // default template .add< MergePoints >() .add< MergePoints >() diff --git a/Sofa/Component/Engine/Generate/tests/Engine.Generate_DataUpdate_test.cpp b/Sofa/Component/Engine/Generate/tests/Engine.Generate_DataUpdate_test.cpp index 86cf0e875c2..e9a7c88e62b 100644 --- a/Sofa/Component/Engine/Generate/tests/Engine.Generate_DataUpdate_test.cpp +++ b/Sofa/Component/Engine/Generate/tests/Engine.Generate_DataUpdate_test.cpp @@ -84,9 +84,9 @@ TestDataEngine< component::engine::generate::NormEngine >, TestDataEngine< component::engine::generate::NormalsFromPoints >, TestDataEngine< component::engine::generate::RandomPointDistributionInSurface >, TestDataEngine< component::engine::generate::Spiral > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(DataEngine_test, TestTypes); //// test number of call to DataEngine::update diff --git a/Sofa/Component/Engine/Generate/tests/JoinPoints_test.cpp b/Sofa/Component/Engine/Generate/tests/JoinPoints_test.cpp index 09c932f3ac6..cbb7b449313 100644 --- a/Sofa/Component/Engine/Generate/tests/JoinPoints_test.cpp +++ b/Sofa/Component/Engine/Generate/tests/JoinPoints_test.cpp @@ -84,13 +84,13 @@ class JoinPoints_test : public ::testing::Test, public JoinPoints<_DataTypes> namespace { - // Define the list of DataTypes to instanciate + // Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec3Types - > DataTypes; // the types to instanciate. + > DataTypes; // the types to instantiate. - // Test suite for all the instanciations + // Test suite for all the instantiations TYPED_TEST_SUITE(JoinPoints_test, DataTypes); // test data setup diff --git a/Sofa/Component/Engine/Generate/tests/RandomPointDistributionInSurface_test.cpp b/Sofa/Component/Engine/Generate/tests/RandomPointDistributionInSurface_test.cpp index 8eb024ddd1e..8ba250214c5 100644 --- a/Sofa/Component/Engine/Generate/tests/RandomPointDistributionInSurface_test.cpp +++ b/Sofa/Component/Engine/Generate/tests/RandomPointDistributionInSurface_test.cpp @@ -99,13 +99,13 @@ class RandomPointDistributionInSurface_test : public ::testing::Test namespace { -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(RandomPointDistributionInSurface_test, DataTypes); // test data setup diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl index 502b801776d..ffa61c28545 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/BaseROI.inl @@ -173,7 +173,7 @@ void BaseROI::init() { msg_error(this) << "Unable to find a MechanicalObject for this component. " "To remove this error message you can either:\n" - " - to specifiy the DOF where to apply the BaseROI with the 'position' attribute.\n" + " - to specify the DOF where to apply the BaseROI with the 'position' attribute.\n" " - to add MechanicalObject or MeshLoader component before the " << this->getClassName() << " in the scene graph.\n"; d_componentState.setValue(ComponentState::Invalid) ; return ; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl index eafed799633..1121b696f00 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/MeshROI.inl @@ -220,7 +220,7 @@ bool MeshROI::isPointInROI(const CPos& p) const const CPos& p0 = DataTypes::getCPos(x0[t[0]]); const CPos& p1 = DataTypes::getCPos(x0[t[1]]); const CPos& p2 = DataTypes::getCPos(x0[t[2]]); - // Normal N compuation of the ROI mesh triangle + // Normal N computation of the ROI mesh triangle CPos N; N[0] = (p1[1]-p0[1])*(p2[2]-p1[2]) - (p1[2]-p0[2])*(p2[1]-p1[1]); N[1] = (p1[2]-p0[2])*(p2[0]-p1[0]) - (p1[0]-p0[0])*(p2[2]-p1[2]); diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/NearestPointROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/NearestPointROI.h index 74cc21a04e9..4c3b93d9225 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/NearestPointROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/NearestPointROI.h @@ -36,7 +36,7 @@ namespace sofa::component::engine::select { /** - * Given two mechanical states, find correspondance between degrees of freedom, based on the minimal distance. + * Given two mechanical states, find correspondence between degrees of freedom, based on the minimal distance. * * Project all the points from the second mechanical state on the first one. This done by finding the point in the * first mechanical state closest to each point in the second mechanical state. If the distance is less than a provided diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h index cbfba0f9b47..9e25ba3ae15 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.h @@ -101,7 +101,7 @@ class ProximityROI : public core::DataEngine //Parameter - Data p_drawSphere; ///< Draw shpere(s) + Data p_drawSphere; ///< Draw sphere(s) Data p_drawPoints; ///< Draw Points Data _drawSize; ///< rendering size for box and topological elements }; diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.inl b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.inl index f9b5a3752a5..88194db7d23 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.inl +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/ProximityROI.inl @@ -42,7 +42,7 @@ ProximityROI::ProximityROI() , f_pointsInROI( initData(&f_pointsInROI,"pointsInROI","Points contained in the ROI") ) , f_distanceInROI( initData(&f_distanceInROI,"distance","distance between the points contained in the ROI and the closest center.") ) , f_indicesOut( initData(&f_indicesOut,"indicesOut","Indices of the points not contained in the ROI") ) - , p_drawSphere( initData(&p_drawSphere,false,"drawSphere","Draw shpere(s)") ) + , p_drawSphere( initData(&p_drawSphere,false,"drawSphere","Draw sphere(s)") ) , p_drawPoints( initData(&p_drawPoints,false,"drawPoints","Draw Points") ) , _drawSize( initData(&_drawSize,1.0,"drawSize","rendering size for box and topological elements") ) { diff --git a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h index f965801d1e7..af5ed9e5804 100644 --- a/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h +++ b/Sofa/Component/Engine/Select/src/sofa/component/engine/select/SelectConnectedLabelsROI.h @@ -49,7 +49,7 @@ class SelectConnectedLabelsROI : public sofa::core::DataEngine Data d_nbLabels; ///< number of label lists typedef type::vector > VecVLabels; core::objectmodel::vectorData d_labels; - Data > d_connectLabels; ///< Pairs of label to be connected accross different label lists + Data > d_connectLabels; ///< Pairs of label to be connected across different label lists //Output Data > d_indices; ///< selected point/cell indices @@ -57,7 +57,7 @@ class SelectConnectedLabelsROI : public sofa::core::DataEngine SelectConnectedLabelsROI(): Inherit1() , d_nbLabels ( initData ( &d_nbLabels,(unsigned int)0,"nbLabels","number of label lists" ) ) , d_labels(this, "labels", "lists of labels associated to each point/cell", core::objectmodel::DataEngineDataType::DataEngineInput) - , d_connectLabels ( initData ( &d_connectLabels,"connectLabels","Pairs of label to be connected accross different label lists" ) ) + , d_connectLabels ( initData ( &d_connectLabels,"connectLabels","Pairs of label to be connected across different label lists" ) ) , d_indices ( initData ( &d_indices,"indices","selected point/cell indices" ) ) { d_labels.resize(d_nbLabels.getValue()); diff --git a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp index e894bb04d06..6b0d14609ae 100644 --- a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp +++ b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp @@ -140,7 +140,7 @@ struct BoxROITest : public sofa::testing::BaseTest boxroi->reinit(); - EXPECT_EQ(boxroi->getComponentState(), ComponentState::Invalid ) << "Reinit shouln't crash or change the state because there is still no MechanicalObject. "; + EXPECT_EQ(boxroi->getComponentState(), ComponentState::Invalid ) << "Reinit shouldn't crash or change the state because there is still no MechanicalObject. "; } diff --git a/Sofa/Component/Engine/Select/tests/Engine.Select_DataUpdate_test.cpp b/Sofa/Component/Engine/Select/tests/Engine.Select_DataUpdate_test.cpp index 0f32ad24fb1..4751ebae1d2 100644 --- a/Sofa/Component/Engine/Select/tests/Engine.Select_DataUpdate_test.cpp +++ b/Sofa/Component/Engine/Select/tests/Engine.Select_DataUpdate_test.cpp @@ -64,9 +64,9 @@ TestDataEngine< component::engine::select::SelectLabelROI >, TestDataEngine< component::engine::select::SubsetTopology >, TestDataEngine< component::engine::select::ValuesFromIndices >, TestDataEngine< component::engine::select::ValuesFromPositions > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(DataEngine_test, TestTypes); //// test number of call to DataEngine::update diff --git a/Sofa/Component/Engine/Testing/src/sofa/component/engine/testing/DataEngineTestCreation.h b/Sofa/Component/Engine/Testing/src/sofa/component/engine/testing/DataEngineTestCreation.h index 7ffffacf893..9ecd9b82f4c 100644 --- a/Sofa/Component/Engine/Testing/src/sofa/component/engine/testing/DataEngineTestCreation.h +++ b/Sofa/Component/Engine/Testing/src/sofa/component/engine/testing/DataEngineTestCreation.h @@ -115,7 +115,7 @@ struct DataEngine_test : public BaseTest /// Testing the number of call to the DataEngine::update() function /// @warning DO NOT test the values computed by the engine - /// To do so, you can inherit this class and add a test function that takes inputs and ouputs to test + /// To do so, you can inherit this class and add a test function that takes inputs and outputs to test void run_basic_test() { /// The comp diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.h b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.h index 3e6f3cd65ea..257de19307a 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.h +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.h @@ -54,7 +54,7 @@ class DifferenceEngine : public core::DataEngine protected: Data d_input; ///< input vector - Data d_substractor; ///< vector to substract to input + Data d_substractor; ///< vector to subtract to input Data d_output; ///< output vector = input-substractor }; diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.inl b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.inl index e4403707d8a..a62a9f12e40 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.inl +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/DifferenceEngine.inl @@ -30,7 +30,7 @@ namespace sofa::component::engine::transform template DifferenceEngine::DifferenceEngine() : d_input ( initData (&d_input, "input", "input vector") ) - , d_substractor ( initData (&d_substractor, "substractor", "vector to substract to input") ) + , d_substractor ( initData (&d_substractor, "substractor", "vector to subtract to input") ) , d_output( initData (&d_output, "output", "output vector = input-substractor") ) { addInput(&d_input); @@ -60,7 +60,7 @@ void DifferenceEngine::doUpdate() if(in.size() != sub.size()) { - msg_warning() << "Input vector and vector to substract should have same size. Abort."; + msg_warning() << "Input vector and vector to subtract should have same size. Abort."; return; } diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/QuatToRigidEngine.cpp b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/QuatToRigidEngine.cpp index ab9fae4a9e7..6b2f625b70d 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/QuatToRigidEngine.cpp +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/QuatToRigidEngine.cpp @@ -31,7 +31,7 @@ namespace sofa::component::engine::transform void registerQuatToRigidEngine(sofa::core::ObjectFactory* factory) { - factory->registerObjects(core::ObjectRegistrationData("Transform a vector of Rigids into two independant vectors for positions (Vec3) and orientations (Quat).") + factory->registerObjects(core::ObjectRegistrationData("Transform a vector of Rigids into two independent vectors for positions (Vec3) and orientations (Quat).") .add< QuatToRigidEngine >()); } diff --git a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/TransformPosition.inl b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/TransformPosition.inl index 46c5fe11e63..89c2dfa3106 100644 --- a/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/TransformPosition.inl +++ b/Sofa/Component/Engine/Transform/src/sofa/component/engine/transform/TransformPosition.inl @@ -164,7 +164,7 @@ void TransformPosition::reinit() /************************************************** * .tfm spec: - * 12 values in the lines begining by "Parameters" + * 12 values in the lines beginning by "Parameters" **************************************************/ template void TransformPosition::getTransfoFromTfm() diff --git a/Sofa/Component/Engine/Transform/tests/Engine.Transform_DataUpdate_test.cpp b/Sofa/Component/Engine/Transform/tests/Engine.Transform_DataUpdate_test.cpp index c28e4330003..743b8971651 100644 --- a/Sofa/Component/Engine/Transform/tests/Engine.Transform_DataUpdate_test.cpp +++ b/Sofa/Component/Engine/Transform/tests/Engine.Transform_DataUpdate_test.cpp @@ -60,9 +60,9 @@ TestDataEngine< component::engine::transform::TransformEngine >, TestDataEngine< component::engine::transform::TranslateTransformMatrixEngine >, TestDataEngine< component::engine::transform::Vertex2Frame > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(DataEngine_test, TestTypes); //// test number of call to DataEngine::update diff --git a/Sofa/Component/Engine/Transform/tests/TransformEngine_test.cpp b/Sofa/Component/Engine/Transform/tests/TransformEngine_test.cpp index 0dce38b09f2..704c9d751d8 100644 --- a/Sofa/Component/Engine/Transform/tests/TransformEngine_test.cpp +++ b/Sofa/Component/Engine/Transform/tests/TransformEngine_test.cpp @@ -131,7 +131,7 @@ class TransformEngine_test_uninitialized : public TransformEngine_test < _DataTy namespace { -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec1Types, @@ -139,9 +139,9 @@ typedef Types< defaulttype::Vec3Types, defaulttype::Rigid2Types, defaulttype::Rigid3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(TransformEngine_test, DataTypes); TYPED_TEST_SUITE(TransformEngine_test_uninitialized, DataTypes); diff --git a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h index 75b9e00b8d3..3b8494339b8 100644 --- a/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h +++ b/Sofa/Component/Haptics/src/sofa/component/haptics/LCPForceFeedback.h @@ -118,7 +118,7 @@ class LCPForceFeedback : public MechanicalStateForceFeedback return core::objectmodel::BaseObject::canCreate(obj, context, arg); } - /// Overide method to lock or unlock the force feedback computation. According to parameter, value == true (resp. false) will lock (resp. unlock) mutex @sa lockForce + /// Override method to lock or unlock the force feedback computation. According to parameter, value == true (resp. false) will lock (resp. unlock) mutex @sa lockForce void setLock(bool value) override; protected: diff --git a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h index 5c005141f94..3e66049734c 100644 --- a/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h +++ b/Sofa/Component/IO/Mesh/src/sofa/component/io/mesh/BaseVTKReader.h @@ -122,7 +122,7 @@ class BaseVTKReader : public BaseObject namespace sofa::component::io::mesh { /// Importing the names defined in the per-file namespace into the classical -/// sofa namespace structre so that the classes are accessible with +/// sofa namespace structure so that the classes are accessible with /// sofa::component::loader::BaseVTKReader instead of /// sofa::component::loader::basevtkreader::BaseVTKReader which is a bit longer to read and write. using basevtkreader::VTKDatasetFormat ; diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h index 36aba9eadfe..b84246a5ad5 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.h @@ -50,7 +50,7 @@ class BTDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver SOFA_CLASS(SOFA_TEMPLATE2(BTDLinearSolver, Matrix, Vector), SOFA_TEMPLATE2(sofa::component::linearsolver::MatrixLinearSolver, Matrix, Vector)); Data d_verbose; ///< Dump system state at each iteration - Data d_problem; ///< display debug informations about subpartSolve computation + Data d_problem; ///< display debug information about subpartSolve computation Data d_subpartSolve; ///< Allows for the computation of a subpart of the system Data d_verification; ///< verification of the subpartSolve @@ -82,7 +82,7 @@ class BTDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver Vector _rh_buf; // // buf the right hand term //Vector _df_buf; // SubVector _acc_rh_bloc; // accumulation of rh through the browsing of the structure - SubVector _acc_lh_bloc; // accumulation of lh through the browsing of the strucutre + SubVector _acc_lh_bloc; // accumulation of lh through the browsing of the structure Index current_bloc, first_block; std::vector Vec_dRH; // buf the dRH on block that are not current_bloc... //////////////////////////// @@ -92,7 +92,7 @@ class BTDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver protected: BTDLinearSolver() : d_verbose( initData(&d_verbose,false,"verbose","Dump system state at each iteration") ) - , d_problem(initData(&d_problem, false,"showProblem", "display debug informations about subpartSolve computation") ) + , d_problem(initData(&d_problem, false,"showProblem", "display debug information about subpartSolve computation") ) , d_subpartSolve(initData(&d_subpartSolve, false,"subpartSolve", "Allows for the computation of a subpart of the system") ) , d_verification(initData(&d_verification, false,"verification", "verification of the subpartSolve")) { @@ -168,7 +168,7 @@ class BTDLinearSolver : public sofa::component::linearsolver::MatrixLinearSolver void fwdAccumulateRHGlobal(Index indMinBloc); - /// step4=> compute solution for the indices in the bloc + /// step4=> compute solution for the indices in the block /// (and accumulate the potential local dRH (set in Vec_dRH) [set in step1] that have not been yet taken into account by the global bwd and fwd void fwdComputeLHinBloc(Index indMaxBloc); diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.inl b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.inl index 50ad8fa3a27..5628a90ab71 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/BTDLinearSolver.inl @@ -211,9 +211,9 @@ void BTDLinearSolver::computeMinvBlock(Index i, Index j) // we need to compute all the Minv[i0][i0] (with i0>=i) till i0=i while (i0 > i) { - if (nBlockComputedMinv[i0] == 1) // only the bloc on the diagonal is computed : need of the bloc [i0][i0-1] + if (nBlockComputedMinv[i0] == 1) // only the block on the diagonal is computed : need of the block [i0][i0-1] { - // compute bloc (i0,i0-1) + // compute block (i0,i0-1) //Minv[i0][i0-1] = Minv[i0][i0]*-L[i0-1].t() Minv.asub((i0 ),(i0-1),bsize,bsize) = Minv.asub((i0 ),(i0 ),bsize,bsize)*(-(lambda[i0-1].t())); ++nBlockComputedMinv[i0]; @@ -224,14 +224,14 @@ void BTDLinearSolver::computeMinvBlock(Index i, Index j) SubMatrix iHi_1; iHi_1 = - lambda[i0-1].t(); H.insert( make_pair( IndexPair(i0, i0-1), iHi_1 ) ); - // compute bloc (i0,i0-1) : the upper diagonal blocks Minv[i0-1][i0] + // compute block (i0,i0-1) : the upper diagonal blocks Minv[i0-1][i0] Minv.asub((i0-1),(i0),bsize,bsize) = -lambda[i0-1] * Minv.asub((i0 ),(i0 ),bsize,bsize); } } - // compute bloc (i0-1,i0-1) : //Minv[i0-1][i0-1] = inv(M[i0-1][i0-1]) + L[i0-1] * Minv[i0][i0-1] + // compute block (i0-1,i0-1) : //Minv[i0-1][i0-1] = inv(M[i0-1][i0-1]) + L[i0-1] * Minv[i0][i0-1] Minv.asub((i0-1),(i0-1),bsize,bsize) = alpha_inv[i0-1] - lambda[i0-1]*Minv.asub((i0 ),(i0-1),bsize,bsize); if(d_subpartSolve.getValue() ) @@ -254,7 +254,7 @@ void BTDLinearSolver::computeMinvBlock(Index i, Index j) /////////////// ADD : Calcul pour faire du partial_solve ////////// - // first iHj is initiallized to iHj0+1 (that is supposed to be already computed) + // first iHj is initialized to iHj0+1 (that is supposed to be already computed) SubMatrix iHj ; if(d_subpartSolve.getValue() ) { @@ -277,7 +277,7 @@ void BTDLinearSolver::computeMinvBlock(Index i, Index j) while (j0 >= j) { - // compute bloc (i0,j0) + // compute block (i0,j0) // Minv[i][j0] = Minv[i][j0+1] * (-L[j0].t) Minv.asub((i0 ),(j0 ),bsize,bsize) = Minv.asub((i0 ),(j0+1),bsize,bsize)*(-lambda[j0].t()); if(d_subpartSolve.getValue() ) @@ -286,7 +286,7 @@ void BTDLinearSolver::computeMinvBlock(Index i, Index j) iHj = iHj * -lambda[j0].t(); H.insert(make_pair(IndexPair(i0,j0),iHj)); - // compute bloc (j0,i0) the upper diagonal blocks Minv[j0][i0] + // compute block (j0,i0) the upper diagonal blocks Minv[j0][i0] Minv.asub((j0 ),(i0 ),bsize,bsize) = -lambda[j0]*Minv.asub((j0+1),(i0),bsize,bsize); } ++nBlockComputedMinv[i0]; @@ -409,7 +409,7 @@ void BTDLinearSolver::init_partial_solve() _acc_lh_bloc=0; _acc_lh_bloc.resize(bsize); - // Bloc that is currently being proceed => start from the end (so that we use step2 bwdAccumulateLHGlobal and accumulate potential initial forces) + // Block that is currently being proceed => start from the end (so that we use step2 bwdAccumulateLHGlobal and accumulate potential initial forces) current_bloc = nb-1; @@ -455,14 +455,14 @@ void BTDLinearSolver::bwdAccumulateRHinBloc(Index indMaxBloc) while(b > current_bloc ) { - // evaluate the Right Hand Term for the bloc b + // evaluate the Right Hand Term for the block b RHbloc = this->getSystemRHVector()->asub(b,bsize) ; // compute the contribution on LH created by RH _acc_lh_bloc += Minv.asub(b,b,bsize,bsize) * RHbloc; b--; - // accumulate this contribution on LH on the lower blocs + // accumulate this contribution on LH on the lower blocks _acc_lh_bloc = -(lambda[b]*_acc_lh_bloc); dmsg_info_when(showProblem) << "bwdLH[" << b << "] = H[" << b << "][" << b + 1 << "] * (Minv[" << b + 1 << "][" << b + 1 << "] * RH[" << b + 1 << "] + bwdLH[" << b + 1 << "])"; @@ -473,7 +473,7 @@ void BTDLinearSolver::bwdAccumulateRHinBloc(Index indMaxBloc) } b = current_bloc; - // compute the bloc which indice is current_bloc + // compute the block which indice is current_bloc this->getSystemLHVector()->asub(b,bsize) = Minv.asub( b, b ,bsize,bsize) * ( fwdContributionOnRH.asub(b, bsize) + this->getSystemRHVector()->asub(b,bsize) ) + bwdContributionOnLH.asub(b, bsize); @@ -555,7 +555,7 @@ void BTDLinearSolver::fwdAccumulateRHGlobal(Index indMinBloc) Index b = current_bloc; - // compute the bloc which indice is _indMaxFwdLHComputed + // compute the block which indice is _indMaxFwdLHComputed this->getSystemLHVector()->asub(b,bsize) = Minv.asub( b, b ,bsize,bsize) * ( fwdContributionOnRH.asub(b, bsize) + this->getSystemRHVector()->asub(b,bsize) ) + bwdContributionOnLH.asub(b, bsize); @@ -589,7 +589,7 @@ void BTDLinearSolver::fwdComputeLHinBloc(Index indMaxBloc) _indMaxFwdLHComputed++; b++; - // compute the bloc which indice is _indMaxFwdLHComputed + // compute the block which indice is _indMaxFwdLHComputed this->getSystemLHVector()->asub(b,bsize) = Minv.asub( b, b ,bsize,bsize) * ( fwdContributionOnRH.asub(b, bsize) + this->getSystemRHVector()->asub(b,bsize) ) + bwdContributionOnLH.asub(b, bsize); @@ -616,7 +616,7 @@ void BTDLinearSolver::partial_solve(ListIndex& Iout, ListIndex& Index MinIdBloc_IN = Iin.front(); // Iin needs to be sorted Index MaxIdBloc_IN = Iin.back(); // //debug - dmsg_info_when(showProblem) << "STEP1: new force on bloc between dofs "<< MinIdBloc_IN<< " and "< this->_indMaxNonNullForce) this->_indMaxNonNullForce = MaxIdBloc_IN; @@ -691,7 +691,7 @@ void BTDLinearSolver::partial_solve(ListIndex& Iout, ListIndex& if (normDR > ((1.0e-7)*normR + 1.0e-20) ) { std::ostringstream oss; - oss <<"++++++++++++++++ WARNING +++++++++++\n \n Found solution for bloc OUT :"; + oss <<"++++++++++++++++ WARNING +++++++++++\n \n Found solution for block OUT :"; for (Index i=MinIdBloc_OUT; i<=MaxIdBloc_OUT; i++) { oss <<" ["<asub(i,bsize); diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/EigenSolverFactory.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/EigenSolverFactory.h index dbfc96590ca..a0076cf817b 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/EigenSolverFactory.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/EigenSolverFactory.h @@ -66,7 +66,7 @@ struct SOFA_COMPONENT_LINEARSOLVER_DIRECT_API BaseEigenSolverProxy /** - * This class is the bridge between an Eigen solver class and the abstact + * This class is the bridge between an Eigen solver class and the abstract * class BaseEigenSolverProxy. * * Using this class, all Eigen solvers can inherit from the same base class, diff --git a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h index d808bad9bfb..2332678be23 100644 --- a/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h +++ b/Sofa/Component/LinearSolver/Direct/src/sofa/component/linearsolver/direct/SparseLDLSolverImpl.h @@ -34,7 +34,7 @@ namespace sofa::component::linearsolver::direct { -//defaut structure for a LDL factorization +//default structure for a LDL factorization template class SparseLDLImplInvertData : public MatrixInvertData { public : @@ -333,7 +333,7 @@ protected : } } - // split the bloc diag in data->Bdiag + // split the block diag in data->Bdiag if (data->new_factorization_needed || !d_precomputeSymbolicDecomposition.getValue() ) { diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MatrixLinearSolver.h b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MatrixLinearSolver.h index a70367e4e74..ad279d38828 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MatrixLinearSolver.h +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MatrixLinearSolver.h @@ -274,7 +274,7 @@ class MatrixLinearSolver : public BaseMatrixLinea v->execute( this->getContext() ); } - /// Implementing the GetCustomTemplateName is mandatory to have a custom template name paremters + /// Implementing the GetCustomTemplateName is mandatory to have a custom template name parameters /// instead of the default one generated automatically by the SOFA_CLASS() macro. static std::string GetCustomTemplateName() { @@ -462,8 +462,8 @@ void MatrixLinearSolver; -/// Extern template declarations don't prevent implicit instanciation in the case -/// of explicitely specialized classes. (See section 14.3.7 of the C++ standard +/// Extern template declarations don't prevent implicit instantiation in the case +/// of explicitly specialized classes. (See section 14.3.7 of the C++ standard /// [temp.expl.spec]). We have to declare non-specialized member functions by /// hand to prevent MSVC from complaining that it doesn't find their definition. extern template SOFA_COMPONENT_LINEARSOLVER_ITERATIVE_API MatrixLinearSolver::MatrixLinearSolver(); diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.inl b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.inl index 87519110284..d4d87e13f6f 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/MinResLinearSolver.inl @@ -164,7 +164,7 @@ void MinResLinearSolver::solve(Matrix& A, Vector& x, Vector& b) alpha = v.dot( y ); // alphak y.peq( *r2, -alpha/beta ); // y += -a/b * r2 - std::swap( r1, r2 ); // save a copy by swaping pointers + std::swap( r1, r2 ); // save a copy by swapping pointers oldb = beta; //oldb = betak beta = y.dot( y ); diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.h b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.h index 3c2db6c6b97..a77daf51db7 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.h +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.h @@ -67,7 +67,7 @@ class ShewchukPCGLinearSolver : public sofa::component::linearsolver::MatrixLine Data d_tolerance; ///< Desired accuracy of the Conjugate Gradient solution evaluating: |r|²/|b|² (ratio of current residual norm over initial residual norm) Data d_use_precond; ///< Use a preconditioner SingleLink l_preconditioner; ///< Link towards the linear solver used to precondition the conjugate gradient - Data d_update_step; ///< Number of steps before the next refresh of precondtioners + Data d_update_step; ///< Number of steps before the next refresh of preconditioners Data d_build_precond; ///< Build the preconditioners, if false build the preconditioner only at the initial step Data > > d_graph; ///< Graph of residuals at each iteration diff --git a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.inl b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.inl index 941c74b6465..68eb09ae9d0 100644 --- a/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.inl +++ b/Sofa/Component/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/ShewchukPCGLinearSolver.inl @@ -40,7 +40,7 @@ ShewchukPCGLinearSolver::ShewchukPCGLinearSolver() , d_tolerance(initData(&d_tolerance, 1e-5, "tolerance", "Desired accuracy of the Conjugate Gradient solution evaluating: |r|²/|b|² (ratio of current residual norm over initial residual norm)") ) , d_use_precond(initData(&d_use_precond, true, "use_precond", "Use a preconditioner") ) , l_preconditioner(initLink("preconditioner", "Link towards the linear solver used to precondition the conjugate gradient")) - , d_update_step(initData(&d_update_step, (unsigned)1, "update_step", "Number of steps before the next refresh of precondtioners") ) + , d_update_step(initData(&d_update_step, (unsigned)1, "update_step", "Number of steps before the next refresh of preconditioners") ) , d_build_precond(initData(&d_build_precond, true, "build_precond", "Build the preconditioners, if false build the preconditioner only at the initial step") ) , d_graph(initData(&d_graph, "graph", "Graph of residuals at each iteration") ) , next_refresh_step(0) diff --git a/Sofa/Component/LinearSolver/Ordering/src/sofa/component/linearsolver/ordering/OrderingMethodAccessor.h b/Sofa/Component/LinearSolver/Ordering/src/sofa/component/linearsolver/ordering/OrderingMethodAccessor.h index 7ac9d3e59ef..cf11f05571d 100644 --- a/Sofa/Component/LinearSolver/Ordering/src/sofa/component/linearsolver/ordering/OrderingMethodAccessor.h +++ b/Sofa/Component/LinearSolver/Ordering/src/sofa/component/linearsolver/ordering/OrderingMethodAccessor.h @@ -94,7 +94,7 @@ class OrderingMethodAccessor : public TBase //To remove for v24.12: if (arg->getAttribute("ordering")) { - //map storing the correspondance between the ordering method name + //map storing the correspondence between the ordering method name //as a Data, and its associated component static const std::map orderingMethodComponentsMap { diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h index b686da3ac14..d0ca34ebf3e 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/BlockJacobiPreconditioner.h @@ -40,7 +40,7 @@ class BlockJacobiPreconditionerInternalData }; -/// Linear solver based on a NxN bloc diagonal matrix (i.e. block Jacobi preconditioner) +/// Linear solver based on a NxN block diagonal matrix (i.e. block Jacobi preconditioner) template class BlockJacobiPreconditioner : public sofa::component::linearsolver::MatrixLinearSolver { diff --git a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.cpp b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.cpp index a4e249d56f0..55d8ae138f1 100644 --- a/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.cpp +++ b/Sofa/Component/LinearSolver/Preconditioner/src/sofa/component/linearsolver/preconditioner/SSORPreconditioner.cpp @@ -99,7 +99,7 @@ void SSORPreconditioner< linearalgebra::CompressedRowSparseMatrix< type::Mat<3,3 typename Matrix::Range rowRange = M.getRowRange(jb); Index xi = rowRange.begin(); while (xi < rowRange.end() && static_cast(colsIndex[xi]) < jb) ++xi; - // bloc on the diagonal + // block on the diagonal const typename Matrix::Block& bdiag = colsValue[xi]; // upper triangle matrix for (++xi; xi < rowRange.end(); ++xi) diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/ConstantSparsityProjectionMethod.h b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/ConstantSparsityProjectionMethod.h index 468ac200aa6..544c6a6fc32 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/ConstantSparsityProjectionMethod.h +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/ConstantSparsityProjectionMethod.h @@ -27,7 +27,7 @@ namespace sofa::component::linearsystem { /** - * Matrix prjection method computing the matrix projection taking advantage of the constant sparsity pattern + * Matrix projection method computing the matrix projection taking advantage of the constant sparsity pattern */ template class ConstantSparsityProjectionMethod : public MatrixProjectionMethod diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/CreateMatrixDispatcher.h b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/CreateMatrixDispatcher.h index 7bbf9512091..df3cfb6968e 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/CreateMatrixDispatcher.h +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/CreateMatrixDispatcher.h @@ -28,7 +28,7 @@ namespace sofa::component::linearsystem /** * Helper class used in matrix assembly, containing some factory methods that - * must be overriden to define the type of local matrices. + * must be overridden to define the type of local matrices. */ template struct CreateMatrixDispatcher diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MappingGraph.h b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MappingGraph.h index 70dd5428d14..482b716e3ae 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MappingGraph.h +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MappingGraph.h @@ -31,7 +31,7 @@ namespace sofa::component::linearsystem using core::behavior::BaseMechanicalState; /** - * Connexions betweeen objects through mappings + * Connexions between objects through mappings * * Graph must be built with the build() function. */ diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h index f5503716579..484aeeac145 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h @@ -170,7 +170,7 @@ class MatrixLinearSystem : public TypedMatrixLinearSystem /// Associate a local matrix to the provided component. The type of the local matrix depends on - /// the situtation of the component: type of the component, mapped vs non-mapped + /// the situation of the component: type of the component, mapped vs non-mapped template void associateLocalMatrixTo(sofa::core::matrixaccumulator::get_component_type* component, const core::MechanicalParams* mparams); diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl index e1285a3a771..2549c7bfb1f 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl @@ -142,7 +142,7 @@ void MatrixLinearSystem::assembleSystem(const core::Mechanical { if (this->getSystemMatrix()->rowSize() == 0 || this->getSystemMatrix()->colSize() == 0) { - msg_error() << "Global system matrix is not resized appropriatly (" << this->getPathName() << ")"; + msg_error() << "Global system matrix is not resized appropriately (" << this->getPathName() << ")"; return; } @@ -1122,7 +1122,7 @@ void MatrixLinearSystem::assembleMappedMatrices(const core::Me { if (this->getSystemMatrix()->rowSize() == 0 || this->getSystemMatrix()->colSize() == 0) { - msg_error() << "Global system matrix is not resized appropriatly"; + msg_error() << "Global system matrix is not resized appropriately"; return; } diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMapping.inl index 7330a12a798..014cb8780a0 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMapping.inl @@ -384,7 +384,7 @@ void BarycentricMapping::applyJT(const core::ConstraintParams * cpara template void BarycentricMapping::handleTopologyChange ( core::topology::Topology* t ) { - //foward topological modifications to the mapper + //forward topological modifications to the mapper if (this->d_mapper.get()){ this->d_mapper->processTopologicalChanges(((const core::State *)this->toModel)->read(core::ConstVecCoordId::position())->getValue(), ((const core::State *)this->fromModel)->read(core::ConstVecCoordId::position())->getValue(), diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h index b612a35d5cf..857303b7686 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BarycentricMappingRigid.h @@ -145,12 +145,12 @@ extern template class SOFA_COMPONENT_MAPPING_LINEAR_API BarycentricMapperHexahed namespace _topologybarycentricmapper_ { extern template class SOFA_COMPONENT_MAPPING_LINEAR_API TopologyBarycentricMapper< defaulttype::Vec3Types, defaulttype::Rigid3Types >; -} // namesapce _topologybarycentricmapper_ +} // namespace _topologybarycentricmapper_ namespace _barycentricmapper_ { extern template class SOFA_COMPONENT_MAPPING_LINEAR_API BarycentricMapper< defaulttype::Vec3Types, defaulttype::Rigid3Types >; -} // namesapce _barycentricmapper_ +} // namespace _barycentricmapper_ } // namespace sofa::component::mapping::linear diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BeamLinearMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BeamLinearMapping.inl index b87e80279e3..8d55b8eebc3 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BeamLinearMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/BeamLinearMapping.inl @@ -200,7 +200,7 @@ void BeamLinearMapping::applyJT(const core::MechanicalParams * /*mpar // if one constraint along (vector n) with a value (v) is applied on the childModel (like collision model) // then this constraint is transformed by (Jt.n) with value (v) for the rigid model // There is a specificity of this propagateConstraint: we have to find the application point on the childModel -// in order to compute the right constaint on the rigidModel. +// in order to compute the right constraint on the rigidModel. template void BeamLinearMapping::applyJT(const core::ConstraintParams * /*cparams*/, Data< typename In::MatrixDeriv >& _out, const Data< typename Out::MatrixDeriv >& _in) { diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h index b3979d6f4e0..aa4fb521355 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/DeformableOnRigidFrameMapping.h @@ -131,7 +131,7 @@ class DeformableOnRigidFrameMapping : public LinearMulti2Mapping::DeformableOnRigidFrameMapping template int DeformableOnRigidFrameMapping::addPoint(const OutCoord& /*c*/) { - msg_info() << "addPoint should be supressed" ; + msg_info() << "addPoint should be suppressed" ; return 0; } template int DeformableOnRigidFrameMapping::addPoint(const OutCoord& /*c*/, int /*indexFrom*/) { - msg_info() << "addPoint should be supressed" ; + msg_info() << "addPoint should be suppressed" ; return 0; } diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMapping.h index 189e66c3447..19f37bf1ff7 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMapping.h @@ -92,7 +92,7 @@ class IdentityMapping : public LinearMapping public: /// Return true if the destination model has the same topology as the source model. /// - /// This is the case for mapping keeping a one-to-one correspondance between + /// This is the case for mapping keeping a one-to-one correspondence between /// input and output DOFs (mostly identity or data-conversion mappings). bool sameTopology() const override { return true; } diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMultiMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMultiMapping.h index da27da5fd52..8f5b998cd95 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMultiMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/IdentityMultiMapping.h @@ -70,7 +70,7 @@ class IdentityMultiMapping : public LinearMultiMapping void apply(const core::MechanicalParams* mparams, const type::vector& dataVecOutPos, const type::vector& dataVecInPos) override; void applyJ(const core::MechanicalParams* mparams, const type::vector& dataVecOutVel, const type::vector& dataVecInVel) override; void applyJT(const core::MechanicalParams* mparams, const type::vector& dataVecOutForce, const type::vector& dataVecInForce) override; - void applyDJT(const core::MechanicalParams* /*mparams*/, core::MultiVecDerivId /*inForce*/, core::ConstMultiVecDerivId /*outForce*/) override {} + void applyDJT(const core::MechanicalParams* /*mparams*/, core::MultiVecDerivId /*enforce*/, core::ConstMultiVecDerivId /*outForce*/) override {} void applyJT( const core::ConstraintParams* cparams, const type::vector< InDataMatrixDeriv* >& dataMatOutConst, const type::vector< const OutDataMatrixDeriv* >& dataMatInConst ) override; virtual const type::vector* getJs() override; diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/LineSetSkinningMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/LineSetSkinningMapping.inl index 2019a7236bd..a9c9d82910b 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/LineSetSkinningMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/LineSetSkinningMapping.inl @@ -338,14 +338,14 @@ void LineSetSkinningMapping::applyJT( const sofa::core::ConstraintPar const OutDeriv data = colIt.val(); const unsigned int verticeIndex = colIt.index(); - //printf(" normale : %f %f %f",d.x(), d.y(), d.z()); + //printf(" normal : %f %f %f",d.x(), d.y(), d.z()); for (unsigned int lineInfluencedIndex = 0; lineInfluencedIndex < linesInfluencedByVertice[verticeIndex].size(); lineInfluencedIndex++) { influencedLineType iline = linesInfluencedByVertice[verticeIndex][lineInfluencedIndex]; type::Vec<3,Real> IP = xfrom[m_topology->getLine(iline.lineIndex)[0]].getOrientation().rotate(iline.position); InDeriv direction; getVCenter(direction) = data * iline.weight; - //printf("\n Weighted normale : %f %f %f",direction.getVCenter().x(), direction.getVCenter().y(), direction.getVCenter().z()); + //printf("\n Weighted normal : %f %f %f",direction.getVCenter().x(), direction.getVCenter().y(), direction.getVCenter().z()); getVOrientation(direction) = IP.cross(data) * iline.weight; o.addCol(m_topology->getLine(iline.lineIndex)[0], direction); diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SimpleTesselatedTetraTopologicalMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SimpleTesselatedTetraTopologicalMapping.h index 9d944969cfe..8e31908079d 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SimpleTesselatedTetraTopologicalMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SimpleTesselatedTetraTopologicalMapping.h @@ -37,7 +37,7 @@ namespace sofa::component::mapping::linear * This class, called SimpleTesselatedTetraTopologicalMapping, is a specific implementation of the interface TopologicalMapping where : * * INPUT TOPOLOGY = TetrahedronSetTopology - * OUTPUT TOPOLOGY = TetrahedronSetTopology which is a finer tesselated version of the INPUT TOPOLOGY + * OUTPUT TOPOLOGY = TetrahedronSetTopology which is a finer tessellated version of the INPUT TOPOLOGY * * Each tetrahedron in the input Topology will be divided in eight tetrahedra in the output topology * diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h index 95c02f33556..21d97b01071 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.h @@ -37,7 +37,7 @@ namespace sofa::component::mapping::linear { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class SubsetMappingInternalData { @@ -82,7 +82,7 @@ class SubsetMapping : public LinearMapping typedef type::Mat MBloc; typedef sofa::linearalgebra::CompressedRowSparseMatrix MatrixType; - /// Correspondance array + /// Correspondence array using IndexArray = sofa::type::rebind_to; typedef sofa::core::topology::PointSubsetData< IndexArray > SetIndex; diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl index be31563afc6..813757c5b47 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMapping.inl @@ -98,7 +98,7 @@ void SubsetMapping::init() else if (d_indices.getValue().empty()) { - // We have to construct the correspondance index + // We have to construct the correspondence index const InVecCoord& in =this->fromModel->read(core::ConstVecCoordId::position())->getValue(); const OutVecCoord& out =this->toModel->read(core::ConstVecCoordId::position())->getValue(); IndexArray& indices = *d_indices.beginEdit(); diff --git a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h index a26188b6d85..066888c34e5 100644 --- a/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h +++ b/Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SubsetMultiMapping.h @@ -70,7 +70,7 @@ class SubsetMultiMapping : public LinearMultiMapping typedef Data OutDataVecDeriv; typedef Data OutDataMatrixDeriv; - /// Correspondance array + /// Correspondence array typedef core::topology::BaseMeshTopology::SetIndex IndexArray; void init() override; diff --git a/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp b/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp index 74414afe16b..668d3719f58 100644 --- a/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp +++ b/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp @@ -101,10 +101,10 @@ struct BarycentricMapperTriangleSetTopologyTest : public BaseTest, public Baryc const Node::SPtr nodeMapping = node->createChild("nodeToMap"); const TriangleSetTopologyContainer::SPtr triangleContainer = New(); const TetrahedronSetTopologyContainer::SPtr tetraContainer = New(); - const MechanicalObject::SPtr mecanical = New>(); + const MechanicalObject::SPtr mechanical = New>(); node->addObject(tetraContainer); - node->addObject(mecanical); + node->addObject(mechanical); node->addChild(nodeMapping); nodeMapping->addObject(triangleContainer); nodeMapping->addObject(thisObject); diff --git a/Sofa/Component/Mapping/Linear/tests/SubsetMultiMapping_test.cpp b/Sofa/Component/Mapping/Linear/tests/SubsetMultiMapping_test.cpp index 8fc7ea84327..b70504770a6 100644 --- a/Sofa/Component/Mapping/Linear/tests/SubsetMultiMapping_test.cpp +++ b/Sofa/Component/Mapping/Linear/tests/SubsetMultiMapping_test.cpp @@ -111,14 +111,14 @@ struct SubsetMultiMappingTest : public MultiMapping_test<_SubsetMultiMapping> }; -// Define the list of types to instanciate. We do not necessarily need to test all combinations. +// Define the list of types to instantiate. We do not necessarily need to test all combinations. using ::testing::Types; typedef Types< mapping::linear::SubsetMultiMapping, mapping::linear::SubsetMultiMapping -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(SubsetMultiMappingTest, DataTypes); // first test case TYPED_TEST( SubsetMultiMappingTest , two_parents_one_child ) diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h index 9c226f13918..3731851cd3a 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceFromTargetMapping.h @@ -35,7 +35,7 @@ namespace sofa::component::mapping::nonlinear { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class DistanceFromTargetMappingInternalData { diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h index 949fb8fa5d3..df197ab65d9 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.h @@ -68,7 +68,7 @@ class DistanceMapping : public BaseNonLinearMapping sofa::core::objectmodel::RenamedData> f_restLengths; - Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial lenght of each of them + Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them Data> d_restLengths; ///< Rest lengths of the connections Data d_showObjectScale; ///< Scale for object display Data d_color; ///< Color for object display. (default=[1.0,1.0,0.0,1.0]) diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl index 6c90d4616fe..75e3f12cd89 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMapping.inl @@ -38,7 +38,7 @@ namespace sofa::component::mapping::nonlinear template DistanceMapping::DistanceMapping() - : d_computeDistance(initData(&d_computeDistance, false, "computeDistance", "if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial lenght of each of them")) + : d_computeDistance(initData(&d_computeDistance, false, "computeDistance", "if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them")) , d_restLengths(initData(&d_restLengths, "restLengths", "Rest lengths of the connections")) , d_showObjectScale(initData(&d_showObjectScale, Real(0), "showObjectScale", "Scale for object display")) , d_color(initData(&d_color, sofa::type::RGBAColor::yellow(), "showColor", "Color for object display. (default=[1.0,1.0,0.0,1.0])")) diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h index 505058aa83c..b10cd4a93ab 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.h @@ -33,7 +33,7 @@ namespace sofa::component::mapping::nonlinear { -/** Maps point positions from serveral mstates to distances (in distance unit). +/** Maps point positions from several mstates to distances (in distance unit). * @tparam TIn parent point positions * @tparam TOut corresponds to a scalar value: distance between point pairs, minus a rest distance. * The pairs are given in a topology with edges in the same node. @@ -82,7 +82,7 @@ class DistanceMultiMapping : public core::MultiMapping, public NonLin SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_MAPPING_NONLINEAR() sofa::core::objectmodel::RenamedData> f_restLengths; - Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial lenght of each of them + Data d_computeDistance; ///< if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them Data> d_restLengths; ///< Rest lengths of the connections Data d_showObjectScale; ///< Scale for object display Data d_color; ///< Color for object display. (default=[1.0,1.0,0.0,1.0]) diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl index 29b6cb83818..4ad968aa54b 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/DistanceMultiMapping.inl @@ -34,7 +34,7 @@ namespace sofa::component::mapping::nonlinear template DistanceMultiMapping::DistanceMultiMapping() : Inherit() - , d_computeDistance(initData(&d_computeDistance, false, "computeDistance", "if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial lenght of each of them")) + , d_computeDistance(initData(&d_computeDistance, false, "computeDistance", "if 'computeDistance = true', then rest length of each element equal 0, otherwise rest length is the initial length of each of them")) , d_restLengths(initData(&d_restLengths, "restLengths", "Rest lengths of the connections")) , d_showObjectScale(initData(&d_showObjectScale, Real(0), "showObjectScale", "Scale for object display")) , d_color(initData(&d_color, sofa::type::RGBAColor::yellow(), "showColor", "Color for object display. (default=[1.0,1.0,0.0,1.0])")) diff --git a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h index 1bb3d6cb0eb..316b04215fd 100644 --- a/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h +++ b/Sofa/Component/Mapping/NonLinear/src/sofa/component/mapping/nonlinear/RigidMapping.h @@ -37,7 +37,7 @@ namespace sofa::component::mapping::nonlinear { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class RigidMappingInternalData { diff --git a/Sofa/Component/Mapping/NonLinear/tests/DistanceMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/DistanceMapping_test.cpp index 94a8e678849..6482b3fa758 100644 --- a/Sofa/Component/Mapping/NonLinear/tests/DistanceMapping_test.cpp +++ b/Sofa/Component/Mapping/NonLinear/tests/DistanceMapping_test.cpp @@ -71,14 +71,14 @@ struct DistanceMappingTest : public sofa::mapping_test::Mapping_test, component::mapping::nonlinear::DistanceMapping -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE( DistanceMappingTest, DataTypes ); // test case diff --git a/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp index b2d56489282..46a53cb53ef 100644 --- a/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp +++ b/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp @@ -200,15 +200,15 @@ void RigidMappingTest, mapping::nonlinear::RigidMapping, mapping::nonlinear::RigidMapping -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(RigidMappingTest, DataTypes); // first test case TYPED_TEST( RigidMappingTest , oneRigid_fourParticles_localCoords ) diff --git a/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp index eccd9286198..833363657c9 100644 --- a/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp +++ b/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp @@ -108,14 +108,14 @@ struct SquareDistanceMappingTest : public sofa::mapping_test::Mapping_test , component::mapping::nonlinear::SquareDistanceMapping -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE( SquareDistanceMappingTest, DataTypes ); // test case diff --git a/Sofa/Component/Mapping/NonLinear/tests/SquareMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/SquareMapping_test.cpp index 66479a8c324..c47beb136e2 100644 --- a/Sofa/Component/Mapping/NonLinear/tests/SquareMapping_test.cpp +++ b/Sofa/Component/Mapping/NonLinear/tests/SquareMapping_test.cpp @@ -69,13 +69,13 @@ struct SquareMappingTest : public sofa::mapping_test::Mapping_test -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE( SquareMappingTest, DataTypes ); // test case diff --git a/Sofa/Component/Mapping/Testing/src/sofa/component/mapping/testing/MappingTestCreation.h b/Sofa/Component/Mapping/Testing/src/sofa/component/mapping/testing/MappingTestCreation.h index 2c2b2163760..3a430a8deed 100644 --- a/Sofa/Component/Mapping/Testing/src/sofa/component/mapping/testing/MappingTestCreation.h +++ b/Sofa/Component/Mapping/Testing/src/sofa/component/mapping/testing/MappingTestCreation.h @@ -109,8 +109,8 @@ struct Mapping_test: public BaseSimulationTest, NumericTest deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is perturbation * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than errorMax * numeric_limits::epsilon - Real errorFactorDJ; ///< The test for geometric stiffness is successfull if the (infinite norm of the) difference is less than errorFactorDJ * errorMax * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than errorMax * numeric_limits::epsilon + Real errorFactorDJ; ///< The test for geometric stiffness is successful if the (infinite norm of the) difference is less than errorFactorDJ * errorMax * numeric_limits::epsilon static constexpr unsigned char TEST_getJs = 1; ///< testing getJs used in assembly API @@ -181,7 +181,7 @@ struct Mapping_test: public BaseSimulationTest, NumericTest deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is deltaRange * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon /// Constructor @@ -131,7 +131,7 @@ struct Multi2Mapping_test : public BaseSimulationTest, NumericTest parents; ///< Parent nodes, created by setupScene simulation::Simulation* simulation; ///< created by the constructor an re-used in the tests std::pair deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is deltaRange * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon MultiMapping_test() @@ -133,7 +133,7 @@ struct MultiMapping_test : public BaseSimulationTest, NumericTest::initRigidImpl() if(!l_topology) { - msg_error(this) << "Unable to retreive a valid MeshTopology component in the current context. \n" + msg_error(this) << "Unable to retrieve a valid MeshTopology component in the current context. \n" "The component cannot be initialized and thus is de-activated. \n " - "To supress this warning you can add a Topology component in the parent node of'<"<< this->getName() <<">'.\n" ; + "To suppress this warning you can add a Topology component in the parent node of'<"<< this->getName() <<">'.\n" ; this->d_componentState.setValue(ComponentState::Invalid) ; } else diff --git a/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.h b/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.h index 025149bf9f2..47c53f8f8b8 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.h +++ b/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.h @@ -262,7 +262,7 @@ class DiagonalMass : public core::behavior::Mass SReal getTotalMass() const { return d_totalMass.getValue(); } std::size_t getMassCount() { return d_vertexMass.getValue().size(); } - /// Print key mass informations (totalMass, vertexMass and massDensity) + /// Print key mass information (totalMass, vertexMass and massDensity) void printMass(); /// @name Read and write access functions in mass information diff --git a/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.inl b/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.inl index 806c58ccb5a..9c8de528f84 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.inl +++ b/Sofa/Component/Mass/src/sofa/component/mass/DiagonalMass.inl @@ -896,7 +896,7 @@ void DiagonalMass::massInitialization() //Mass initialization process if(d_vertexMass.isSet() || d_massDensity.isSet() || d_totalMass.isSet() ) { - //totalMass data is prioritary on vertexMass and massDensity + //totalMass data has priority on vertexMass and massDensity if (d_totalMass.isSet()) { if(d_vertexMass.isSet() || d_massDensity.isSet()) diff --git a/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.h b/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.h index bddcc0ce966..e67680dbcb4 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.h +++ b/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.h @@ -105,7 +105,7 @@ class MeshMatrixMass : public core::behavior::Mass Data< Real > d_showAxisSize; ///< factor length of the axis displayed (only used for rigids) /// if mass lumping should be performed (only compute mass on vertices) Data< bool > d_lumping; - /// if specific mass information should be outputed + /// if specific mass information should be outputted Data< bool > d_printMass; ///< Boolean to print the mass Data< std::map < std::string, sofa::type::vector > > f_graph; ///< Graph of the controlled potential @@ -154,7 +154,7 @@ class MeshMatrixMass : public core::behavior::Mass return d_vertexMass.getValue().size(); } - /// Print key mass informations (totalMass, vertexMass and massDensity) + /// Print key mass information (totalMass, vertexMass and massDensity) void printMass(); /// Compute the mass from input values diff --git a/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.inl b/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.inl index 8f0336e38f0..0581dce726d 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.inl +++ b/Sofa/Component/Mass/src/sofa/component/mass/MeshMatrixMass.inl @@ -113,7 +113,7 @@ void MeshMatrixMass::applyEdgeMassDestruction(Index // ------------------------------------------------------- //{ -/// Creation fonction for mass stored on vertices +/// Creation function for mass stored on vertices template template = 2, int > > void MeshMatrixMass::applyVertexMassTriangleCreation(const sofa::type::vector< Index >& triangleAdded, @@ -171,7 +171,7 @@ void MeshMatrixMass::applyVertexMassTriangleCreatio } } -/// Creation fonction for mass stored on edges +/// Creation function for mass stored on edges template template = 2, int > > void MeshMatrixMass::applyEdgeMassTriangleCreation(const sofa::type::vector< Index >& triangleAdded, @@ -220,13 +220,13 @@ void MeshMatrixMass::applyEdgeMassTriangleCreation( // update total mass if (!this->isLumped()) { - totalMass += 3.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass += 3.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } } -/// Destruction fonction for mass stored on vertices +/// Destruction function for mass stored on vertices template template = 2, int > > void MeshMatrixMass::applyVertexMassTriangleDestruction(const sofa::type::vector< Index >& triangleRemoved) @@ -273,7 +273,7 @@ void MeshMatrixMass::applyVertexMassTriangleDestruc } } -/// Destruction fonction for mass stored on edges +/// Destruction function for mass stored on edges template template = 2, int > > void MeshMatrixMass::applyEdgeMassTriangleDestruction(const sofa::type::vector< Index >& triangleRemoved) @@ -311,7 +311,7 @@ void MeshMatrixMass::applyEdgeMassTriangleDestructi // update total mass if (!this->isLumped()) { - totalMass -= 3.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass -= 3.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } @@ -324,7 +324,7 @@ void MeshMatrixMass::applyEdgeMassTriangleDestructi // --------------------------------------------------- //{ -/// Creation fonction for mass stored on vertices +/// Creation function for mass stored on vertices template template = 2, int > > void MeshMatrixMass::applyVertexMassQuadCreation(const sofa::type::vector< Index >& quadAdded, @@ -383,7 +383,7 @@ void MeshMatrixMass::applyVertexMassQuadCreation(co } } -/// Creation fonction for mass stored on edges +/// Creation function for mass stored on edges template template = 2, int > > void MeshMatrixMass::applyEdgeMassQuadCreation(const sofa::type::vector< Index >& quadAdded, @@ -433,13 +433,13 @@ void MeshMatrixMass::applyEdgeMassQuadCreation(cons // update total mass if (!this->isLumped()) { - totalMass += 4.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass += 4.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } } -/// Destruction fonction for mass stored on vertices +/// Destruction function for mass stored on vertices template template = 2, int > > void MeshMatrixMass::applyVertexMassQuadDestruction(const sofa::type::vector< Index >& quadRemoved) @@ -487,7 +487,7 @@ void MeshMatrixMass::applyVertexMassQuadDestruction } } -/// Destruction fonction for mass stored on edges +/// Destruction function for mass stored on edges template template = 2, int > > void MeshMatrixMass::applyEdgeMassQuadDestruction(const sofa::type::vector< Index >& quadRemoved) @@ -526,7 +526,7 @@ void MeshMatrixMass::applyEdgeMassQuadDestruction(c // update total mass if (!this->isLumped()) { - totalMass -= 4.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass -= 4.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } @@ -541,7 +541,7 @@ void MeshMatrixMass::applyEdgeMassQuadDestruction(c // ---------------------------------------------------------- //{ -/// Creation fonction for mass stored on vertices +/// Creation function for mass stored on vertices template template = 3, int > > @@ -601,7 +601,7 @@ void MeshMatrixMass::applyVertexMassTetrahedronCrea } } -/// Creation fonction for mass stored on edges +/// Creation function for mass stored on edges template template = 3, int > > void MeshMatrixMass::applyEdgeMassTetrahedronCreation(const sofa::type::vector< Index >& tetrahedronAdded, @@ -651,13 +651,13 @@ void MeshMatrixMass::applyEdgeMassTetrahedronCreati // update total mass if (!this->isLumped()) { - totalMass += 6.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass += 6.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } } -/// Destruction fonction for mass stored on vertices +/// Destruction function for mass stored on vertices template template = 3, int > > void MeshMatrixMass::applyVertexMassTetrahedronDestruction(const sofa::type::vector< Index >& tetrahedronRemoved) @@ -705,7 +705,7 @@ void MeshMatrixMass::applyVertexMassTetrahedronDest } } -/// Destruction fonction for mass stored on edges +/// Destruction function for mass stored on edges template template = 3, int > > void MeshMatrixMass::applyEdgeMassTetrahedronDestruction(const sofa::type::vector< Index >& tetrahedronRemoved) @@ -744,7 +744,7 @@ void MeshMatrixMass::applyEdgeMassTetrahedronDestru // update total mass if (!this->isLumped()) { - totalMass -= 6.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass -= 6.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } @@ -758,7 +758,7 @@ void MeshMatrixMass::applyEdgeMassTetrahedronDestru // --------------------------------------------------------- //{ -/// Creation fonction for mass stored on vertices +/// Creation function for mass stored on vertices template template = 3, int > > void MeshMatrixMass::applyVertexMassHexahedronCreation(const sofa::type::vector< Index >& hexahedronAdded, @@ -821,7 +821,7 @@ void MeshMatrixMass::applyVertexMassHexahedronCreat } } -/// Creation fonction for mass stored on edges +/// Creation function for mass stored on edges template template = 3, int > > void MeshMatrixMass::applyEdgeMassHexahedronCreation(const sofa::type::vector< Index >& hexahedronAdded, @@ -875,13 +875,13 @@ void MeshMatrixMass::applyEdgeMassHexahedronCreatio // update total mass if (!this->isLumped()) { - totalMass += 12.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass += 12.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } } -/// Destruction fonction for mass stored on vertices +/// Destruction function for mass stored on vertices template template = 3, int > > void MeshMatrixMass::applyVertexMassHexahedronDestruction(const sofa::type::vector< Index >& hexahedronRemoved) @@ -933,7 +933,7 @@ void MeshMatrixMass::applyVertexMassHexahedronDestr } } -/// Destruction fonction for mass stored on edges +/// Destruction function for mass stored on edges template template = 3, int > > void MeshMatrixMass::applyEdgeMassHexahedronDestruction(const sofa::type::vector< Index >& hexahedronRemoved) @@ -976,7 +976,7 @@ void MeshMatrixMass::applyEdgeMassHexahedronDestruc // update total mass if (!this->isLumped()) { - totalMass -= 12.0 * mass * 2.0; // x 2 because mass is actually splitted over half-edges + totalMass -= 12.0 * mass * 2.0; // x 2 because mass is actually split over half-edges } } } @@ -1115,7 +1115,7 @@ sofa::geometry::ElementType MeshMatrixMass::checkTo template void MeshMatrixMass::initTopologyHandlers(sofa::geometry::ElementType topologyType) { - // add the functions to handle topology changes for Vertex informations + // add the functions to handle topology changes for Vertex information d_vertexMass.createTopologyHandler(l_topology); d_vertexMass.setCreationCallback([this](Index pointIndex, MassType& m, const core::topology::BaseMeshTopology::Point& point, @@ -1129,7 +1129,7 @@ void MeshMatrixMass::initTopologyHandlers(sofa::geo applyVertexMassDestruction(pointIndex, m); }); - // add the functions to handle topology changes for Edge informations + // add the functions to handle topology changes for Edge information d_edgeMass.createTopologyHandler(l_topology); d_edgeMass.setCreationCallback([this](Index edgeIndex, MassType& EdgeMass, const core::topology::BaseMeshTopology::Edge& edge, @@ -1143,7 +1143,7 @@ void MeshMatrixMass::initTopologyHandlers(sofa::geo applyEdgeMassDestruction(edgeIndex, m); }); - // register engines to the corresponding toplogy containers depending on current topology type + // register engines to the corresponding topology containers depending on current topology type bool hasTriangles = false; bool hasQuads = false; @@ -1268,7 +1268,7 @@ void MeshMatrixMass::massInitialization() //Mass initialization process if(d_vertexMass.isSet() || d_massDensity.isSet() || d_totalMass.isSet() ) { - //totalMass data is prioritary on vertexMass and massDensity + //totalMass data is priority on vertexMass and massDensity if (d_totalMass.isSet()) { if(d_vertexMass.isSet() || d_massDensity.isSet()) @@ -1666,7 +1666,7 @@ bool MeshMatrixMass::checkEdgeMass() template void MeshMatrixMass::initFromVertexAndEdgeMass() { - msg_info() << "verteMass and edgeMass informations are used"; + msg_info() << "verteMass and edgeMass information are used"; const sofa::type::vector vertexMass = d_vertexMass.getValue(); const sofa::type::vector edgeMass = d_edgeMass.getValue(); diff --git a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.cpp b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.cpp index 023051cdd36..ceabfd1e890 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.cpp +++ b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.cpp @@ -187,7 +187,7 @@ void UniformMass::loadFromFileRigidImpl(const string& filename) else // it's an unknown keyword { msg_error(this) << "error reading file '" << filename << "'. \n" - << "Unable to decode an unknow command '"<< cmd << "'. \n" ; + << "Unable to decode an unknown command '"<< cmd << "'. \n" ; skipToEOL(file); } } diff --git a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.h b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.h index b43fe61b28b..258eb345e10 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.h +++ b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.h @@ -73,7 +73,7 @@ class UniformMass : public core::behavior::Mass /// optional range of local DOF indices. Any computation involving only /// indices outside of this range are discarded (useful for parallelization - /// using mesh partitionning) + /// using mesh partitioning) Data< type::Vec<2,int> > d_localRange; DataSetIndex d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded Data d_preserveTotalMass; ///< Prevent totalMass from decreasing when removing particles. @@ -99,7 +99,7 @@ class UniformMass : public core::behavior::Mass ~UniformMass(); - /// @internal fonction called in the constructor that can be specialized + /// @internal function called in the constructor that can be specialized void constructor_message() ; public: diff --git a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.inl b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.inl index c8a23bdf9a2..2916700048b 100644 --- a/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.inl +++ b/Sofa/Component/Mass/src/sofa/component/mass/UniformMass.inl @@ -72,7 +72,7 @@ UniformMass::UniformMass() , d_showX0 ( initData ( &d_showX0, false, "showX0", "display the rest positions" ) ) , d_localRange ( initData ( &d_localRange, Vec<2,int> ( -1,-1 ), "localRange", "optional range of local DOF indices. \n" "Any computation involving only indices outside of this range \n" - "are discarded (useful for parallelization using mesh partitionning)" ) ) + "are discarded (useful for parallelization using mesh partitioning)" ) ) , d_indices ( initData ( &d_indices, "indices", "optional local DOF indices. Any computation involving only indices outside of this list are discarded" ) ) , d_preserveTotalMass( initData ( &d_preserveTotalMass, false, "preserveTotalMass", "Prevent totalMass from decreasing when removing particles.")) , l_topology(initLink("topology", "link to the topology container")) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConicalForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConicalForceField.h index 70aae7726ea..849d0e80b48 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConicalForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/ConicalForceField.h @@ -31,7 +31,7 @@ namespace sofa::component::mechanicalload { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class ConicalForceFieldInternalData { diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h index 4cc2bfbae6d..5a6ca2b55db 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/EllipsoidForceField.h @@ -30,7 +30,7 @@ namespace sofa::component::mechanicalload { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class EllipsoidForceFieldInternalData { diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/InteractionEllipsoidForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/InteractionEllipsoidForceField.h index d73706574af..0a9cccd4b7b 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/InteractionEllipsoidForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/InteractionEllipsoidForceField.h @@ -32,7 +32,7 @@ namespace sofa::component::mechanicalload { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class InteractionEllipsoidForceFieldInternalData { diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.h index c338329b09e..4114be3b96e 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.h @@ -31,7 +31,7 @@ namespace sofa::component::mechanicalload { -/// This class can be overridden if needed for additionnal storage within +/// This class can be overridden if needed for additional storage within /// template specializations. template class PlaneForceFieldInternalData @@ -77,7 +77,7 @@ class PlaneForceField : public core::behavior::ForceField Data d_bilateral; /// optional range of local DOF indices. Any computation involving indices outside of this - /// range are discarded (useful for parallelization using mesh partitionning) + /// range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2,int> > d_localRange; Data d_drawIsEnabled; ///< enable/disable drawing of plane. (default=false) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.inl index 125c736403b..abbd6ec1e03 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/PlaneForceField.inl @@ -79,7 +79,7 @@ PlaneForceField::PlaneForceField() : , d_damping(initData(&d_damping, (Real)5, "damping", "force damping. (default=5)")) , d_maxForce(initData(&d_maxForce, (Real)0, "maxForce", "if non-null , the max force that can be applied to the object. (default=0)")) , d_bilateral( initData(&d_bilateral, false, "bilateral", "if true the plane force field is applied on both sides. (default=false)")) - , d_localRange( initData(&d_localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving indices outside of this range are discarded (useful for parallelization using mesh partitionning)" ) ) + , d_localRange( initData(&d_localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , d_drawIsEnabled(initData(&d_drawIsEnabled, false, "showPlane", "enable/disable drawing of plane. (default=false)")) , d_drawColor(initData(&d_drawColor, sofa::type::RGBAColor(0.0f,.5f,.2f,1.0f), "planeColor", "plane color. (default=[0.0,0.5,0.2,1.0])")) , d_drawSize(initData(&d_drawSize, (Real)10.0f, "showPlaneSize", "plane display size if draw is enabled. (default=10)")) diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h index 433816d5c7d..91ab0c73428 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.h @@ -34,7 +34,7 @@ namespace sofa::component::mechanicalload { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class SphereForceFieldInternalData { @@ -121,7 +121,7 @@ class SphereForceField : public core::behavior::ForceField Data d_damping; ///< force damping Data d_color; ///< sphere color. (default=[0,0,1,1]) - /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning) + /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2,int> > d_localRange; /// option bilateral : if true, the force field is applied on both side of the plane Data d_bilateral; diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl index 432db057643..b447186793a 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/SphereForceField.inl @@ -57,7 +57,7 @@ SphereForceField::SphereForceField() , d_stiffness(initData(&d_stiffness, (Real)500, "stiffness", "force stiffness")) , d_damping(initData(&d_damping, (Real)5, "damping", "force damping")) , d_color(initData(&d_color, sofa::type::RGBAColor(0.0f, 0.0f, 1.0f, 1.0f), "color", "sphere color. (default=[0,0,1,1])")) - , d_localRange(initData(&d_localRange, type::Vec<2,int>(-1, -1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning)" ) ) + , d_localRange(initData(&d_localRange, type::Vec<2,int>(-1, -1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , d_bilateral(initData(&d_bilateral, false, "bilateral", "if true the sphere force field is applied on both sides")) { contacts.setOriginalData(&d_contacts); diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h index fe69aa16445..dc41b36c794 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.h @@ -141,7 +141,7 @@ class TaitSurfacePressureForceField : public core::behavior::ForceField d_currentPressure; ///< OUT: Current pressure, as computed from the last surface position Data< Real > d_currentStiffness; ///< OUT: dP/dV at current volume and pressure - Data< SeqTriangles > d_pressureTriangles; ///< OUT: list of triangles where a pressure is applied (mesh triangles + tesselated quads) + Data< SeqTriangles > d_pressureTriangles; ///< OUT: list of triangles where a pressure is applied (mesh triangles + tessellated quads) Data< Real > d_initialSurfaceArea; ///< OUT: Initial surface area, as computed from the surface rest position Data< Real > d_currentSurfaceArea; ///< OUT: Current surface area, as computed from the last surface position diff --git a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl index fd6090accd0..e75e8d0fd27 100644 --- a/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl +++ b/Sofa/Component/MechanicalLoad/src/sofa/component/mechanicalload/TaitSurfacePressureForceField.inl @@ -49,7 +49,7 @@ TaitSurfacePressureForceField::TaitSurfacePressureForceField(): d_currentVolume(initData(&d_currentVolume, (Real)0.0, "currentVolume", "OUT: Current volume, as computed from the last surface position")), d_currentPressure(initData(&d_currentPressure, (Real)0.0, "currentPressure", "OUT: Current pressure, as computed from the last surface position")), d_currentStiffness(initData(&d_currentStiffness, (Real)0.0, "currentStiffness", "OUT: dP/dV at current volume and pressure")), - d_pressureTriangles(initData(&d_pressureTriangles, "pressureTriangles", "OUT: list of triangles where a pressure is applied (mesh triangles + tesselated quads)")), + d_pressureTriangles(initData(&d_pressureTriangles, "pressureTriangles", "OUT: list of triangles where a pressure is applied (mesh triangles + tessellated quads)")), d_initialSurfaceArea(initData(&d_initialSurfaceArea, (Real)0.0, "initialSurfaceArea", "OUT: Initial surface area, as computed from the surface rest position")), d_currentSurfaceArea(initData(&d_currentSurfaceArea, (Real)0.0, "currentSurfaceArea", "OUT: Current surface area, as computed from the last surface position")), d_drawForceScale(initData(&d_drawForceScale, (Real)0.001, "drawForceScale", "DEBUG: scale used to render force vectors")), diff --git a/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp b/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp index ba0c439a646..83f763d9c40 100644 --- a/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/ConstantForceField_test.cpp @@ -227,7 +227,7 @@ struct ConstantForceField_test : public BaseSimulationTest, NumericTest @@ -240,7 +240,7 @@ TypeTuple > DataTypes; -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(ConstantForceField_test, DataTypes);// first test case TYPED_TEST( ConstantForceField_test , testBasicAttributes ) { diff --git a/Sofa/Component/MechanicalLoad/tests/PlaneForceField_test.cpp b/Sofa/Component/MechanicalLoad/tests/PlaneForceField_test.cpp index bab1bd89732..5459c9291a9 100644 --- a/Sofa/Component/MechanicalLoad/tests/PlaneForceField_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/PlaneForceField_test.cpp @@ -220,7 +220,7 @@ struct PlaneForceField_test : public BaseSimulationTest return true; } - /// This kind of test is important as it enforce the developper to take a wider range of + /// This kind of test is important as it enforce the developer to take a wider range of /// input values and check that they are gracefully handled. bool testMonkeyValuesForAttributes() { @@ -339,7 +339,7 @@ struct PlaneForceField_test : public BaseSimulationTest }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< TypeTuple @@ -349,7 +349,7 @@ typedef Types< ,TypeTuple > DataTypes; -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(PlaneForceField_test, DataTypes);// first test case TYPED_TEST( PlaneForceField_test , testPlaneForceField ) { diff --git a/Sofa/Component/MechanicalLoad/tests/SkeletalMotionConstraint_test.cpp b/Sofa/Component/MechanicalLoad/tests/SkeletalMotionConstraint_test.cpp index f6a846d532b..35e39dff75f 100644 --- a/Sofa/Component/MechanicalLoad/tests/SkeletalMotionConstraint_test.cpp +++ b/Sofa/Component/MechanicalLoad/tests/SkeletalMotionConstraint_test.cpp @@ -177,13 +177,13 @@ struct SkeletalMotionProjectiveConstraint_test : public BaseSimulationTest, Nume }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Rigid3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(SkeletalMotionProjectiveConstraint_test, DataTypes); // first test case TYPED_TEST( SkeletalMotionProjectiveConstraint_test , twoConstrainedBones ) diff --git a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp index c624b9e2a30..173b2523a89 100644 --- a/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp +++ b/Sofa/Component/ODESolver/Backward/src/sofa/component/odesolver/backward/VariationalSymplecticSolver.cpp @@ -91,7 +91,7 @@ void VariationalSymplecticSolver::solve(const core::ExecParams* params, SReal dt MultiVecDeriv newp(&vop); MultiVecDeriv vel_1(&vop, vResult); // vector of final velocity - MultiVecDeriv p(&vop); // vector of momemtum + MultiVecDeriv p(&vop); // vector of momentum // dx is no longer allocated by default (but it will be deleted automatically by the mechanical objects) MultiVecDeriv dx(&vop, core::VecDerivId::dx()); dx.realloc(&vop, !d_threadSafeVisitor.getValue(), true); @@ -101,10 +101,10 @@ void VariationalSymplecticSolver::solve(const core::ExecParams* params, SReal dt if (cpt == 0 || this->getContext()->getTime()==0.0) { - vop.v_alloc(pID); // allocate a new vector in Mechanical Object to store the momemtum - MultiVecDeriv pInit(&vop, pID); // initialize the first value of the momemtum to M*v + vop.v_alloc(pID); // allocate a new vector in Mechanical Object to store the momentum + MultiVecDeriv pInit(&vop, pID); // initialize the first value of the momentum to M*v pInit.clear(); - mop.addMdx(pInit,vel_1,1.0); // momemtum is initialized to M*vinit (assume 0 acceleration) + mop.addMdx(pInit,vel_1,1.0); // momentum is initialized to M*vinit (assume 0 acceleration) // Compute potential energy at time t=0 SReal KineticEnergy; @@ -122,8 +122,8 @@ void VariationalSymplecticSolver::solve(const core::ExecParams* params, SReal dt } cpt++; - MultiVecDeriv pPrevious(&vop, pID); // get previous momemtum value - p.eq(pPrevious); // set p to previous momemtum + MultiVecDeriv pPrevious(&vop, pID); // get previous momentum value + p.eq(pPrevious); // set p to previous momentum typedef core::behavior::BaseMechanicalState::VMultiOp VMultiOp; @@ -357,7 +357,7 @@ void VariationalSymplecticSolver::solve(const core::ExecParams* params, SReal dt mop.solveConstraint(x_1,core::ConstraintOrder::POS); } - // update the previous momemtum as the current one for next step + // update the previous momentum as the current one for next step pPrevious.eq(newp); } diff --git a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverDynamic_test.cpp index 430f99fea34..bec03c1f10f 100644 --- a/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/EulerImplicitSolverDynamic_test.cpp @@ -145,13 +145,13 @@ struct EulerImplicitDynamic_test : public component::odesolver::testing::ODESolv }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(EulerImplicitDynamic_test, DataTypes); // Test case: h=0.1 k=100 m =10 rm=0 rk=0 diff --git a/Sofa/Component/ODESolver/Backward/tests/NewmarkImplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/NewmarkImplicitSolverDynamic_test.cpp index f2739479f4a..092a5e781fc 100644 --- a/Sofa/Component/ODESolver/Backward/tests/NewmarkImplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/NewmarkImplicitSolverDynamic_test.cpp @@ -159,13 +159,13 @@ struct NewmarkImplicitDynamic_test : public component::odesolver::testing::ODESo }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(NewmarkImplicitDynamic_test, DataTypes); // Test case: h=0.001 diff --git a/Sofa/Component/ODESolver/Backward/tests/SpringSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/SpringSolverDynamic_test.cpp index b0864941f38..ce4ab459c71 100644 --- a/Sofa/Component/ODESolver/Backward/tests/SpringSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/SpringSolverDynamic_test.cpp @@ -117,13 +117,13 @@ struct SpringSolverDynamic_test : public NumericTest }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< defaulttype::Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(SpringSolverDynamic_test, DataTypes); // Test case EulerImplicit Solver diff --git a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticExplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticExplicitSolverDynamic_test.cpp index 85f4eb7914c..5164f0a4d92 100644 --- a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticExplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticExplicitSolverDynamic_test.cpp @@ -151,13 +151,13 @@ struct VariationalSymplecticExplicitSolverDynamic_test : public component::odeso }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(VariationalSymplecticExplicitSolverDynamic_test, DataTypes); // Test case: h=0.001 diff --git a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverDynamic_test.cpp index 62cdb907b67..dfed7294f3e 100644 --- a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverDynamic_test.cpp @@ -185,13 +185,13 @@ struct VariationalSymplecticImplicitSolverDynamic_test : public component::odeso }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(VariationalSymplecticImplicitSolverDynamic_test, DataTypes); // Test case: h=0.1 k=100 m =1 rm=0.1 rk=0.1 diff --git a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp index 125923f3d66..2c729cc8bb8 100644 --- a/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Backward/tests/VariationalSymplecticImplicitSolverNonLinearForceDynamic_test.cpp @@ -239,13 +239,13 @@ struct VariationalSymplecticImplicitSolverNonLinearForceDynamic_test : public Ba }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(VariationalSymplecticImplicitSolverNonLinearForceDynamic_test, DataTypes); // Test case: h=0.001 diff --git a/Sofa/Component/ODESolver/Forward/tests/CentralDifferenceExplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Forward/tests/CentralDifferenceExplicitSolverDynamic_test.cpp index ad02ae561e3..54728aa702e 100644 --- a/Sofa/Component/ODESolver/Forward/tests/CentralDifferenceExplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Forward/tests/CentralDifferenceExplicitSolverDynamic_test.cpp @@ -177,13 +177,13 @@ struct CentralDifferenceExplicitSolverDynamic_test : public component::odesolver }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(CentralDifferenceExplicitSolverDynamic_test, DataTypes); // Test case: h=0.01 k=100 m =10 rm=0.1 rk=0.1 diff --git a/Sofa/Component/ODESolver/Forward/tests/EulerExplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Forward/tests/EulerExplicitSolverDynamic_test.cpp index 5a025b0eaee..13b9996e99f 100644 --- a/Sofa/Component/ODESolver/Forward/tests/EulerExplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Forward/tests/EulerExplicitSolverDynamic_test.cpp @@ -145,13 +145,13 @@ struct EulerExplicitDynamic_test : public component::odesolver::testing::ODESolv }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(EulerExplicitDynamic_test, DataTypes); // Test case: h=0.001 k=100 m=10 diff --git a/Sofa/Component/ODESolver/Forward/tests/RungeKutta2ExplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Forward/tests/RungeKutta2ExplicitSolverDynamic_test.cpp index b8218c020d0..a14d872f70c 100644 --- a/Sofa/Component/ODESolver/Forward/tests/RungeKutta2ExplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Forward/tests/RungeKutta2ExplicitSolverDynamic_test.cpp @@ -159,13 +159,13 @@ struct RungeKutta2ExplicitSolverDynamic_test : public component::odesolver::test }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(RungeKutta2ExplicitSolverDynamic_test, DataTypes); // Test case: h=0.1 k=100 m =10 rm=0.1 rk=0.1 diff --git a/Sofa/Component/ODESolver/Forward/tests/RungeKutta4ExplicitSolverDynamic_test.cpp b/Sofa/Component/ODESolver/Forward/tests/RungeKutta4ExplicitSolverDynamic_test.cpp index f3c2543ffb8..6324580e9b5 100644 --- a/Sofa/Component/ODESolver/Forward/tests/RungeKutta4ExplicitSolverDynamic_test.cpp +++ b/Sofa/Component/ODESolver/Forward/tests/RungeKutta4ExplicitSolverDynamic_test.cpp @@ -195,13 +195,13 @@ struct RungeKutta4ExplicitSolverDynamic_test : public component::odesolver::test }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(RungeKutta4ExplicitSolverDynamic_test, DataTypes); // Test case: h=0.1 k=100 m =10 rm=0.1 rk=0.1 diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp b/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp index cff6913810e..124d86d4d21 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp +++ b/Sofa/Component/Playback/src/sofa/component/playback/CompareState.cpp @@ -55,7 +55,7 @@ look for potential CompareStateFile formatted likewise with - %0 the current scene name - %1 the current comparestate counter value -- %2 the name of the mstate which will undergo comparizons. +- %2 the name of the mstate which will undergo comparisons. */ std::string lookForValidCompareStateFile( const std::string& sceneName, const std::string& mstateName, diff --git a/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp b/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp index 18e8ffbf6a4..b6a20b6fe7f 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp +++ b/Sofa/Component/Playback/src/sofa/component/playback/CompareTopology.cpp @@ -69,7 +69,7 @@ void CompareTopology::processCompareTopology() if (!topo) { - msg_error() << "CompareTopology can't acces to the Topology."; + msg_error() << "CompareTopology can't access to the Topology."; return; } diff --git a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.cpp b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.cpp index 330aaf600d4..bf284c9da8c 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.cpp +++ b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.cpp @@ -41,8 +41,8 @@ void registerInputEventReader(sofa::core::ObjectFactory* factory) InputEventReader::InputEventReader() : d_filename(initData(&d_filename, std::string("/dev/input/mouse2"), "filename", "input events file name")) - , d_inverseSense(initData(&d_inverseSense, false, "inverseSense", "inverse the sense of the mouvement")) - , d_printEvent(initData(&d_printEvent, false, "printEvent", "Print event informations")) + , d_inverseSense(initData(&d_inverseSense, false, "inverseSense", "inverse the sense of the movement")) + , d_printEvent(initData(&d_printEvent, false, "printEvent", "Print event information")) //, timeout( initData(&timeout, 0, "timeout", "time out to get an event from file" )) , d_key1(initData(&d_key1, '0', "key1", "Key event generated when the left pedal is pressed")) , d_key2(initData(&d_key2, '1', "key2", "Key event generated when the right pedal is pressed")) diff --git a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h index aa1b8431ea4..6eb0e713c4f 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/InputEventReader.h @@ -96,8 +96,8 @@ class InputEventReader : public core::objectmodel::BaseObject sofa::core::objectmodel::DataFileName p_outputFilename; sofa::core::objectmodel::DataFileName d_filename; ///< file in which the events are read. - Data d_inverseSense; ///< inverse the sense of the mouvement - Data d_printEvent; ///< Print event informations + Data d_inverseSense; ///< inverse the sense of the movement + Data d_printEvent; ///< Print event information Data d_key1; ///< Key event generated when the left pedal is pressed Data d_key2; ///< Key event generated when the right pedal is pressed Data d_writeEvents; ///< If true, write incoming events ; if false, read events from that file (if an output filename is provided) @@ -106,7 +106,7 @@ class InputEventReader : public core::objectmodel::BaseObject std::ofstream* outFile; // Data timeout; - int fd; ///< desciptor to open and read the file. + int fd; ///< descriptor to open and read the file. int deplX, deplY; ///< mouse relative deplacements. diff --git a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.cpp b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.cpp index 0939d67140f..14012330204 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.cpp +++ b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.cpp @@ -30,7 +30,7 @@ using namespace defaulttype; void registerReadTopology(sofa::core::ObjectFactory* factory) { - factory->registerObjects(core::ObjectRegistrationData("Read topology containers informations from file at each timestep.") + factory->registerObjects(core::ObjectRegistrationData("Read topology containers information from file at each timestep.") .add< ReadTopology >()); } diff --git a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h index 9a0a2c5f12a..abd7f4e23f4 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/ReadTopology.h @@ -39,7 +39,7 @@ namespace sofa::component::playback { -/** Read Topology containers informations from file at each timestep +/** Read Topology containers information from file at each timestep */ class SOFA_COMPONENT_PLAYBACK_API ReadTopology: public core::objectmodel::BaseObject { diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h b/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h index c3db8c36fb4..fe78b4c38d9 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteState.h @@ -42,7 +42,7 @@ namespace sofa::component::playback { /** Write State vectors to file at a given set of time instants - * A period can be etablished at the last time instant + * A period can be established at the last time instant * The DoFs to print can be chosen using DOFsX and DOFsV * Stop to write the state if the kinematic energy reach a given threshold (stopAt) * The energy will be measured at each period determined by keperiod diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.cpp b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.cpp index b2d92a8c12b..65b70489ae9 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.cpp +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.cpp @@ -31,7 +31,7 @@ using namespace defaulttype; void registerWriteTopology(sofa::core::ObjectFactory* factory) { - factory->registerObjects(core::ObjectRegistrationData("Write topology containers informations to file at each timestep.") + factory->registerObjects(core::ObjectRegistrationData("Write topology containers information to file at each timestep.") .add< WriteTopology >()); } diff --git a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h index 796d6508b49..77706b00a7a 100644 --- a/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h +++ b/Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.h @@ -43,9 +43,9 @@ namespace sofa::component::playback { -/** Write Topology containers informations into a file at a given set of time instants - * A period can be etablished at the last time instant. - * The informations to write can be choosen. by default there will be only commun containers. +/** Write Topology containers information into a file at a given set of time instants + * A period can be established at the last time instant. + * The information to write can be chosen. by default there will be only commun containers. * An option is available to write shells containers. * * This part is not handle yet: diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h index 06ffcd97986..fab657df4fc 100644 --- a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h +++ b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/InfoComponent.h @@ -29,12 +29,12 @@ namespace sofa::component::sceneutility::infocomponent { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. When closing this namespace +/// fearing it will leak names into the global namespace. When closing this namespace /// selected object from this per-file namespace are then imported into their parent namespace. /// for ease of use using sofa::core::objectmodel::BaseObject ; -/// Despite this component does absolutely nothin... it is very usefull as it can be used to +/// Despite this component does absolutely nothing... it is very useful as it can be used to /// retain information scene graph. class SOFA_COMPONENT_SCENEUTILITY_API InfoComponent : public BaseObject { diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeAliasComponent.h b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeAliasComponent.h index 5b806484072..96ccab239de 100644 --- a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeAliasComponent.h +++ b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeAliasComponent.h @@ -33,7 +33,7 @@ namespace sofa::component::sceneutility::makealiascomponent { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. When closing this namespace +/// fearing it will leak names into the global namespace. When closing this namespace /// selected object from this per-file namespace are then imported into their parent namespace. /// for ease of use /// diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeDataAliasComponent.h b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeDataAliasComponent.h index 557ff7d0f3c..eee41a045da 100644 --- a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeDataAliasComponent.h +++ b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MakeDataAliasComponent.h @@ -32,7 +32,7 @@ namespace sofa::component::sceneutility::makedataaliascomponent { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. When closing this namespace +/// fearing it will leak names into the global namespace. When closing this namespace /// selected object from this per-file namespace are then imported into their parent namespace. /// for ease of use diff --git a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp index 71c57151b40..f3cab5870db 100644 --- a/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp +++ b/Sofa/Component/SceneUtility/src/sofa/component/sceneutility/MessageHandlerComponent.cpp @@ -89,7 +89,7 @@ void MessageHandlerComponent::parse ( core::objectmodel::BaseObjectDescription* }else{ msg_info(this) << " the following handler '" << stype << "' is not a supported. " "The default sofa style will be used. " - "To supress this message you need to specify a valid attribute " + "To suppress this message you need to specify a valid attribute " "among [clang, log, silent, sofa]." ; return ; } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h index 7a33c866944..cc68dbf18a5 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h @@ -39,7 +39,7 @@ namespace sofa::component::solidmechanics::fem::elastic template class FastTetrahedralCorotationalForceField; -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class FastTetrahedralCorotationalForceFieldData { @@ -154,7 +154,7 @@ class FastTetrahedralCorotationalForceField : public BaseLinearElasticityFEMForc core::topology::EdgeData d_edgeInfo; ///< Internal edge data core::topology::TetrahedronData d_tetrahedronInfo; ///< Internal tetrahedron data - VecCoord _initialPoints;///< the intial positions of the points + VecCoord _initialPoints;///< the initial positions of the points Data d_method; ///< method for rotation computation :"qr" (by QR) or "polar" or "polar2" or "none" (Linear elastic) RotationDecompositionMethod m_decompositionMethod; diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl index f9deaa3d318..5c1f4fe5d05 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/HexahedronFEMForceField.inl @@ -308,7 +308,7 @@ const typename HexahedronFEMForceField::Transformation& HexahedronFEM ///////////////////////////////////////////////// // enable to use generic matrix computing code instead of the original optimized code specific to parallelepipeds #define GENERIC_STIFFNESS_MATRIX -// enable to use the full content of the MaterialStiffness matrix, instead of only the 3x3 upper bloc +// enable to use the full content of the MaterialStiffness matrix, instead of only the 3x3 upper block #define MAT_STIFFNESS_USE_W // enable to use J when computing qx/qy/qz, instead of computing the matrix relative to (x1,x2,x3) and pre/post multiply by J^-1 afterward. // note that this does not matter if the element is a cube. diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h index f94d7b06541..0c26029c00d 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.h @@ -229,7 +229,7 @@ protected : public: - /// Forcefield intern paramaters + /// Forcefield intern parameters int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl index 0bd730ee2c4..add56877b76 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/QuadBendingFEMForceField.inl @@ -321,7 +321,7 @@ void QuadBendingFEMForceField::computeBendingStrainDisplacement(Strai } // ------------------------------------------------------------------------------------------------------------ -// --- Compute the strain-displacement matrix (Shear componenent) where (a, b, c, d) are the coordinates of the 4 nodes of a rectangular +// --- Compute the strain-displacement matrix (Shear component) where (a, b, c, d) are the coordinates of the 4 nodes of a rectangular // ------------------------------------------------------------------------------------------------------------ template void QuadBendingFEMForceField::computeShearStrainDisplacement(StrainDisplacement &Js, /*Index elementIndex*/ Real l, Real h/*Coord a, Coord b, Coord c, Coord d*/ ) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl index 9f0c5171598..b80db2e698f 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedralCorotationalFEMForceField.inl @@ -395,7 +395,7 @@ void TetrahedralCorotationalFEMForceField::computeMaterialStiffness(i } // materialMatrix /= (volumes6);//*6 christian // @TODO: in TetrahedronFEMForceField, the stiffness matrix is divided by 6 compared to the code in TetrahedralCorotationalFEMForceField. Check which is the correct one... - // FF: there is normally a factor 1/6v in the strain-displacement matrix. Times transpose makes 1/36v². Integrating accross the volume multiplies by v, so the factor is 1/36v + // FF: there is normally a factor 1/6v in the strain-displacement matrix. Times transpose makes 1/36v². Integrating across the volume multiplies by v, so the factor is 1/36v materialMatrix /= (volumes6*6); } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h index 50c441429da..10652e50b37 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h @@ -54,7 +54,7 @@ namespace sofa::component::solidmechanics::fem::elastic template class TetrahedronFEMForceField; -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class TetrahedronFEMForceFieldInternalData { @@ -304,7 +304,7 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField d_showElementGapScale; ///< draw gap between elements (when showWireFrame is disabled) [0,1]: 0: no gap, 1: no element - Data d_updateStiffness; ///< udpate structures (precomputed in init) using stiffness parameters in each iteration (set listening=1) + Data d_updateStiffness; ///< update structures (precomputed in init) using stiffness parameters in each iteration (set listening=1) using Inherit1::l_topology; diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl index ab58dd6875a..4a5ce9bfb61 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl @@ -64,7 +64,7 @@ TetrahedronFEMForceField::TetrahedronFEMForceField() , d_showVonMisesStressPerNodeColorMap(initData(&d_showVonMisesStressPerNodeColorMap,false,"showVonMisesStressPerNodeColorMap","draw elements showing vonMises stress interpolated in nodes")) , d_showVonMisesStressPerElement(initData(&d_showVonMisesStressPerElement, false, "showVonMisesStressPerElement", "draw triangles showing vonMises stress interpolated in elements")) , d_showElementGapScale(initData(&d_showElementGapScale, (Real)0.333, "showElementGapScale", "draw gap between elements (when showWireFrame is disabled) [0,1]: 0: no gap, 1: no element")) - , d_updateStiffness(initData(&d_updateStiffness, false, "updateStiffness", "udpate structures (precomputed in init) using stiffness parameters in each iteration (set listening=1)")) + , d_updateStiffness(initData(&d_updateStiffness, false, "updateStiffness", "update structures (precomputed in init) using stiffness parameters in each iteration (set listening=1)")) { data.initPtrData(this); this->addAlias(&d_assembling, "assembling"); @@ -696,7 +696,7 @@ inline SReal TetrahedronFEMForceField::getPotentialEnergy(const core: Displacement F; // ComputeForce without the case of plasticity simulation when d_plasticMaxThreshold.getValue() > 0 - // This case actually modifies the member plasticStrain and getPotentialEnergy is a const fonction. + // This case actually modifies the member plasticStrain and getPotentialEnergy is a const function. MaterialStiffness K = materialsStiffnesses[i]; StrainDisplacement J = strainDisplacements[i]; @@ -1303,7 +1303,7 @@ void TetrahedronFEMForceField::init() this->f_listening.setValue(true); } - // ParallelDataThrd is used to build the matrix asynchronusly (when listening = true) + // ParallelDataThrd is used to build the matrix asynchronously (when listening = true) // This feature is activated when callin handleEvent with ParallelizeBuildEvent // At init parallelDataSimu == parallelDataThrd (and it's the case since handleEvent is called) @@ -1363,7 +1363,7 @@ void TetrahedronFEMForceField::init() } } - // Tesselation of each cube into 6 tetrahedra + // Tessellation of each cube into 6 tetrahedra tetrahedra->reserve(size_t(nbcubes)*6); for (sofa::Size i=0; i::accumulateForceLarge(VecCoord& f, const V f[b] += R_2_0 * Coord(F[2], F[3], 0); f[c] += R_2_0 * Coord(F[4], F[5], 0); - // store for re-use in matrix-vector products + // store for reuse in matrix-vector products if (implicit) { _strainDisplacements[elementIndex] = J; diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h index 1608c261fae..4a178998e1f 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.h @@ -252,7 +252,7 @@ protected : public: - /// Forcefield intern paramaters + /// Forcefield intern parameters int method; SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_FEM_ELASTIC() @@ -295,7 +295,7 @@ protected : Data< sofa::type::vector > d_initialTransformation; ///< Flag activating rendering of stress directions within each triangle /// Fracture parameters - Data d_hosfordExponant; ///< Exponant in the Hosford yield criteria + Data d_hosfordExponant; ///< Exponent in the Hosford yield criteria Data d_criteriaValue; ///< Fracturable threshold used to draw fracturable triangles /// Display parameters diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl index e2cd641e92c..408adaab380 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl @@ -48,7 +48,7 @@ TriangularFEMForceField::TriangularFEMForceField() , d_method(initData(&d_method, std::string("large"), "method", "large: large displacements, small: small displacements")) , d_rotatedInitialElements(initData(&d_rotatedInitialElements, "rotatedInitialElements", "Flag activating rendering of stress directions within each triangle")) , d_initialTransformation(initData(&d_initialTransformation, "initialTransformation", "Flag activating rendering of stress directions within each triangle")) - , d_hosfordExponant(initData(&d_hosfordExponant, (Real)1.0, "hosfordExponant", "Exponant in the Hosford yield criteria")) + , d_hosfordExponant(initData(&d_hosfordExponant, (Real)1.0, "hosfordExponant", "Exponent in the Hosford yield criteria")) , d_criteriaValue(initData(&d_criteriaValue, (Real)1e15, "criteriaValue", "Fracturable threshold used to draw fracturable triangles")) , d_showStressValue(initData(&d_showStressValue, true, "showStressValue", "Flag activating rendering of stress values as a color in each triangle")) , d_showStressVector(initData(&d_showStressVector, false, "showStressVector", "Flag activating rendering of stress directions within each triangle")) @@ -791,7 +791,7 @@ void TriangularFEMForceField::computeStress(type::Vec<3, Real>& stres // then compute displacement in this frame m_triangleUtils.computeDisplacementLarge(D, R_0_2, triangleInf[elementIndex].rotatedInitialElements, p[a], p[b], p[c]); - // and compute postions of a, b, c in the co-rotational frame + // and compute positions of a, b, c in the co-rotational frame Coord A = Coord(0, 0, 0); SOFA_UNUSED(A); Coord B = R_0_2 * (p[b] - p[a]); Coord C = R_0_2 * (p[c] - p[a]); diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.h b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.h index a8b3af2cc49..23ea6aa0a20 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.h +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.h @@ -35,7 +35,7 @@ namespace sofa::component::solidmechanics::fem::elastic template class TriangularFEMForceFieldOptim; -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class TriangularFEMForceFieldOptimInternalData { @@ -234,7 +234,7 @@ class TriangularFEMForceFieldOptim : public BaseLinearElasticityFEMForceField d_damping; ///< Ratio damping/stiffness Data d_restScale; ///< Scale factor applied to rest positions (to simulate pre-stretched materials) diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.inl b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.inl index 302380320d1..3259d22b7dd 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.inl +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceFieldOptim.inl @@ -143,7 +143,7 @@ void TriangularFEMForceFieldOptim::initTriangleInfo(Index i, Triangle ab *= restScale; ac *= restScale; } - // equivalent to computeRotationLarge but in 2D == do not store the ortogonal vector are framex ^ framey + // equivalent to computeRotationLarge but in 2D == do not store the orthogonal vector are framex ^ framey computeTriangleRotation(ti.init_frame, ab, ac); // compute initial position in local space A[0, 0] B[x, 0] C[x, y] @@ -265,7 +265,7 @@ void TriangularFEMForceFieldOptim::addForce(const core::MechanicalPar // | 0 gamma1 0 gamma2 0 gamma3 | / (2 * A) // | gamma1 beta1 gamma2 beta2 gamma3 beta3 | - // As no displacement for Pa nor in Pb[y], Beta1, gamma1 and beta3 are not considered. Therefor we obtain: + // As no displacement for Pa nor in Pb[y], Beta1, gamma1 and beta3 are not considered. Therefore we obtain: // | beta2 0 beta3 0 | // | 0 gamma2 0 gamma3 | / (2 * A) // | gamma2 beta2 gamma3 beta3 | @@ -309,7 +309,7 @@ void TriangularFEMForceFieldOptim::addForce(const core::MechanicalPar f[t[1]] += fb; f[t[2]] += fc; - // store data for re-use + // store data for reuse ts.stress = stress; } diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/HexahedronFEMForceField_test.cpp b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/HexahedronFEMForceField_test.cpp index 7db71294a30..c95c360ef3f 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/HexahedronFEMForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/HexahedronFEMForceField_test.cpp @@ -122,15 +122,15 @@ struct HexahedronFEMForceField_test : public ForceField_test<_HexahedronFEMForce } }; -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; typedef ::testing::Types< sofa::component::solidmechanics::fem::elastic::HexahedronFEMForceField -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(HexahedronFEMForceField_test, TestTypes); // test case diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TetrahedronFEMForceField_stepTest.cpp b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TetrahedronFEMForceField_stepTest.cpp index bc6863a6f51..70de4804c86 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TetrahedronFEMForceField_stepTest.cpp +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TetrahedronFEMForceField_stepTest.cpp @@ -96,15 +96,15 @@ struct TetrahedronFEMForceField_stepTest : public ForceField_test<_TetrahedronFE }; -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; typedef ::testing::Types< sofa::component::solidmechanics::fem::elastic::TetrahedronFEMForceField -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(TetrahedronFEMForceField_stepTest, TestTypes); // test case diff --git a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_stepTest.cpp b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_stepTest.cpp index 26f5ecd51b2..c29bf739f08 100644 --- a/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_stepTest.cpp +++ b/Sofa/Component/SolidMechanics/FEM/Elastic/tests/TriangleFEMForceField_stepTest.cpp @@ -85,7 +85,7 @@ typedef ::testing::Types< -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(TriangleFEMForceField_stepTest, TestTypes); TYPED_TEST(TriangleFEMForceField_stepTest, test ) diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.h b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.h index e9d72e80123..fc111a7b248 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.h +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.h @@ -41,7 +41,7 @@ namespace sofa::component::solidmechanics::fem::hyperelastic //***************** Tetrahedron FEM code for several elastic models: StandardTetrahedralFEMForceField******************************************************************* //********************************** Based on classical discretization : Fi=-Bi^T S V and Kij=Bi^T N Bj +Di^T S Dj ********************************************** //***************************************** where Bi is the strain displacement (6*3 matrix), S SPK tensor N=dS/dC, Di shape vector ************************************ -//**************************** Code dependant on HyperelasticMatrialFEM and inherited classes ********************************************************************* +//**************************** Code dependent on HyperelasticMatrialFEM and inherited classes ********************************************************************* /** Compute Finite Element forces based on tetrahedral elements. */ @@ -105,7 +105,7 @@ public : //Matrix63 matB[4]; Real strainEnergy; - //Tetrahedron Points Indicies for CUDA + //Tetrahedron Points Indices for CUDA float tetraIndices[4]{}; //Tetrahedron Edges for CUDA float tetraEdges[6]{}; @@ -140,7 +140,7 @@ public : protected : core::topology::BaseMeshTopology* m_topology; - VecCoord _initialPoints; /// the intial positions of the points + VecCoord _initialPoints; /// the initial positions of the points bool updateMatrix; bool _meshSaved ; Data f_materialName; ///< the name of the material to be used diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.inl b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.inl index 084fea26034..c7ce2017fa6 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.inl +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/src/sofa/component/solidmechanics/fem/hyperelastic/StandardTetrahedralFEMForceField.inl @@ -291,7 +291,7 @@ void StandardTetrahedralFEMForceField::addForce(const core::Mechanica if (mparams->implicit()) { // if implicit solver recompute the stiffness matrix stored at each edge - // starts by reseting each matrix to 0 + // starts by resetting each matrix to 0 for(l=0; l::testDerivatives() VecCoord &pos = *d_pos.beginEdit(); pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - // perturbate original state: + // perturb original state: srand( 0 ); for (unsigned int idx=0; idx::testDerivatives() VecCoord &pos = *d_pos.beginEdit(); pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - // perturbate original state: + // perturb original state: srand( 0 ); for (unsigned int idx=0; idx::MatrixSym e = generatePositiveDefiniteMatrix(lcg); sofa::type::Vec<6, SReal> eVec; diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_params_test.cpp b/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_params_test.cpp index 7c2c4da6cc1..7845bbe38e8 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_params_test.cpp +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_params_test.cpp @@ -131,12 +131,12 @@ struct TetrahedronHyperelasticityFEMForceField_params_test : public BaseSimulati }; -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; -typedef ::testing::Types > TestTypes; // the types to instanciate. +typedef ::testing::Types > TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(TetrahedronHyperelasticityFEMForceField_params_test, TestTypes); // test case diff --git a/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_scene_test.cpp b/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_scene_test.cpp index 8c77b8382b8..f68e680790f 100644 --- a/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_scene_test.cpp +++ b/Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/TetrahedronHyperelasticityFEMForceField_scene_test.cpp @@ -143,12 +143,12 @@ struct TetrahedronHyperelasticityFEMForceField_scene_test : public BaseSimulatio }; -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; -typedef ::testing::Types > TestTypes; // the types to instanciate. +typedef ::testing::Types > TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(TetrahedronHyperelasticityFEMForceField_scene_test, TestTypes); // test case diff --git a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMForceFieldAndMass.inl b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMForceFieldAndMass.inl index 2838aafc996..f4040250526 100644 --- a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMForceFieldAndMass.inl +++ b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMForceFieldAndMass.inl @@ -662,7 +662,7 @@ void HexahedronCompositeFEMForceFieldAndMass::computeMechanicalMatricesDirect EigenMatrix Kg = EigenMatrix::Zero(sizeass * 3, 8 * 3); // stiffness of contrained nodes - EigenMatrix A = EigenMatrix::Zero(sizeass * 3, sizeass * 3); // [Kf -G] == Kf (stiffness of free nodes) with the constaints + EigenMatrix A = EigenMatrix::Zero(sizeass * 3, sizeass * 3); // [Kf -G] == Kf (stiffness of free nodes) with the constraints for ( std::size_t i=0; i::computeMechanicalMatricesRecurs type::Mat<27*3, 8*3, Real> Kg; // stiffness of contrained nodes - type::Mat<27*3, 27*3, Real> A; // [Kf -G] Kf (stiffness of free nodes) with the constaints + type::Mat<27*3, 27*3, Real> A; // [Kf -G] Kf (stiffness of free nodes) with the constraints type::Mat<27*3, 27*3, Real> Ainv; @@ -1332,7 +1332,7 @@ void HexahedronCompositeFEMForceFieldAndMass::computeMechanicalMatricesRecurs } EigenMatrix Kg = EigenMatrix::Zero(sizeass * 3, idxcutasscoarse * 3);// stiffness of contrained nodes - EigenMatrix A = EigenMatrix::Zero(sizeass * 3, sizeass * 3); // [Kf -G] == Kf (stiffness of free nodes) with the constaints + EigenMatrix A = EigenMatrix::Zero(sizeass * 3, sizeass * 3); // [Kf -G] == Kf (stiffness of free nodes) with the constraints for( auto it = map_idxq_idxcutass.begin(); it!=map_idxq_idxcutass.end(); ++it) { diff --git a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMMapping.h b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMMapping.h index e103b4ea162..6a1d853a15c 100644 --- a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMMapping.h +++ b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/HexahedronCompositeFEMMapping.h @@ -121,8 +121,8 @@ protected : // in order to treat large dispacements in translation (rotation is given by the corotational force field) // InVecCoord _baycenters0; // InCoord computeTranslation( const SparseGridTopologyT::Hexa& hexa, unsigned idx ); - OutVecCoord _p0; // intial position of the interpolated vertices - InVecCoord _qCoarse0, _qFine0; // intial position of the element nodes + OutVecCoord _p0; // initial position of the interpolated vertices + InVecCoord _qCoarse0, _qFine0; // initial position of the element nodes InVecCoord _qFine; // only for drawing // type::vector< type::Quat > _rotations; diff --git a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/NonUniformHexahedralFEMForceFieldAndMass.h b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/NonUniformHexahedralFEMForceFieldAndMass.h index cf6ffcc6688..243f9cc0b8d 100644 --- a/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/NonUniformHexahedralFEMForceFieldAndMass.h +++ b/Sofa/Component/SolidMechanics/FEM/NonUniform/src/sofa/component/solidmechanics/fem/nonuniform/NonUniformHexahedralFEMForceFieldAndMass.h @@ -173,7 +173,7 @@ class NonUniformHexahedralFEMForceFieldAndMass : virtual public component::solid protected: - // --------------- Modified method: compute and re-use MBK + // --------------- Modified method: compute and reuse MBK typedef component::solidmechanics::fem::elastic::HexahedralFEMForceFieldAndMass Inherited; typedef typename Inherited::HexahedronInformation HexahedronInformation; typedef typename Inherited::Mat33 Mat33; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h index 5ac5385ca38..3677cf59b68 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FrameSpringForceField.h @@ -171,7 +171,7 @@ class FrameSpringForceField : public core::behavior::PairInteractionForceField d_showLawfulTorsion; - Data d_showExtraTorsion; ///< dislpay the illicit part of the joint rotation + Data d_showExtraTorsion; ///< display the illicit part of the joint rotation FrameSpringForceFieldInternalData data; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.h index ae1dbc08177..f46df5c7d5c 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.h @@ -62,7 +62,7 @@ class MeshSpringForceField : public virtual SpringForceField Data< Real > d_drawMaxElongationRange; ///< Max range of elongation (red eongation - blue neutral - green compression) Data< Real > d_drawSpringSize; ///< Size of drawed lines - /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning) + /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2, sofa::Index> > d_localRange; /// Link to be set to the topology container in the component graph. diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.inl index a2017891736..b36565e01c9 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/MeshSpringForceField.inl @@ -46,7 +46,7 @@ MeshSpringForceField::MeshSpringForceField() , d_drawMinElongationRange(initData(&d_drawMinElongationRange, Real(8.), "drawMinElongationRange","Min range of elongation (red eongation - blue neutral - green compression)")) , d_drawMaxElongationRange(initData(&d_drawMaxElongationRange, Real(15.), "drawMaxElongationRange","Max range of elongation (red eongation - blue neutral - green compression)")) , d_drawSpringSize(initData(&d_drawSpringSize, Real(8.), "drawSpringSize","Size of drawed lines")) - , d_localRange( initData(&d_localRange, type::Vec<2, sofa::Index>(sofa::InvalidID, sofa::InvalidID), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning)" ) ) + , d_localRange( initData(&d_localRange, type::Vec<2, sofa::Index>(sofa::InvalidID, sofa::InvalidID), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , l_topology(initLink("topology", "link to the topology container")) { this->d_ks.setDisplayed(false); diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.h index 2ae928e3f70..0186434fb40 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.h @@ -65,7 +65,7 @@ class PolynomialRestShapeSpringsForceField : public core::behavior::ForceField > d_points; ///< points controlled by the rest shape springs - Data< type::vector > d_external_points; ///< points from the external Mechancial State that define the rest shape springs + Data< type::vector > d_external_points; ///< points from the external Mechanical State that define the rest shape springs /// polynomial data /// Describe set of polynomial coefficients combines in one array. diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.inl index 63b75450260..1cabdaea4b2 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialRestShapeSpringsForceField.inl @@ -37,7 +37,7 @@ namespace sofa::component::solidmechanics::spring template PolynomialRestShapeSpringsForceField::PolynomialRestShapeSpringsForceField() : d_points(initData(&d_points, "points", "points controlled by the rest shape springs")) - , d_external_points(initData(&d_external_points, "external_points", "points from the external Mechancial State that define the rest shape springs")) + , d_external_points(initData(&d_external_points, "external_points", "points from the external Mechanical State that define the rest shape springs")) , d_polynomialStiffness(initData(&d_polynomialStiffness, "polynomialStiffness", "coefficients for all spring polynomials")) , d_polynomialDegree(initData(&d_polynomialDegree, "polynomialDegree", "vector of values that show polynomials degrees")) , d_recomputeIndices(initData(&d_recomputeIndices, false, "recompute_indices", "Recompute indices (should be false for BBOX)")) diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialSpringsForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialSpringsForceField.inl index 547a69fa4c5..0e4031c1dce 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialSpringsForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/PolynomialSpringsForceField.inl @@ -161,7 +161,7 @@ void PolynomialSpringsForceField::recomputeIndices() if (m_firstObjectIndices.size() > m_secondObjectIndices.size()) { - msg_error() << "Error : the dimention of the source and the targeted points are different "; + msg_error() << "Error : the dimension of the source and the targeted points are different "; m_firstObjectIndices.clear(); m_secondObjectIndices.clear(); } diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h index dcd49430065..aa121a98879 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.h @@ -49,7 +49,7 @@ class QuadBendingSprings : public SpringForceField SOFA_ATTRIBUTE_DEPRECATED__RENAME_DATA_IN_SOLIDMECHANICS_SPRING() sofa::core::objectmodel::RenamedData> localRange; - /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning) + /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2,int> > d_localRange; /// Link to be set to the topology container in the component graph. diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl index 057d48aa7b3..58681013c2c 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/QuadBendingSprings.inl @@ -33,7 +33,7 @@ namespace sofa::component::solidmechanics::spring template QuadBendingSprings::QuadBendingSprings() : SpringForceField() - , d_localRange( initData(&d_localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning)" ) ) + , d_localRange( initData(&d_localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) , l_topology(initLink("topology", "link to the topology container")) { localRange.setOriginalData(&d_localRange); diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.h index c08facb46d4..bba03aad7c0 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.h @@ -74,7 +74,7 @@ class RestShapeSpringsForceField : public core::behavior::ForceField Data< VecReal > d_stiffness; ///< stiffness values between the actual position and the rest shape position Data< VecReal > d_angularStiffness; ///< angularStiffness assigned when controlling the rotation of the points Data< type::vector< CPos > > d_pivotPoints; ///< global pivot points used when translations instead of the rigid mass centers - Data< VecIndex > d_external_points; ///< points from the external Mechancial State that define the rest shape springs + Data< VecIndex > d_external_points; ///< points from the external Mechanical State that define the rest shape springs Data< bool > d_recompute_indices; ///< Recompute indices (should be false for BBOX) Data< bool > d_drawSpring; ///< draw Spring Data< sofa::type::RGBAColor > d_springColor; ///< spring color. (default=[0.0,1.0,0.0,1.0]) diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.inl index 2c677371551..557ee0b39d7 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/RestShapeSpringsForceField.inl @@ -55,7 +55,7 @@ RestShapeSpringsForceField::RestShapeSpringsForceField() , d_stiffness(initData(&d_stiffness, "stiffness", "stiffness values between the actual position and the rest shape position")) , d_angularStiffness(initData(&d_angularStiffness, "angularStiffness", "angularStiffness assigned when controlling the rotation of the points")) , d_pivotPoints(initData(&d_pivotPoints, "pivot_points", "global pivot points used when translations instead of the rigid mass centers")) - , d_external_points(initData(&d_external_points, "external_points", "points from the external Mechancial State that define the rest shape springs")) + , d_external_points(initData(&d_external_points, "external_points", "points from the external Mechanical State that define the rest shape springs")) , d_recompute_indices(initData(&d_recompute_indices, true, "recompute_indices", "Recompute indices (should be false for BBOX)")) , d_drawSpring(initData(&d_drawSpring,false,"drawSpring","draw Spring")) , d_springColor(initData(&d_springColor, sofa::type::RGBAColor::green(), "springColor","spring color. (default=[0.0,1.0,0.0,1.0])")) diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.h index 21e7b88c687..10917030043 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.h @@ -37,7 +37,7 @@ namespace sofa::component::solidmechanics::spring { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class SpringForceFieldInternalData { diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.inl index bb723f5f012..3d188ddb981 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/SpringForceField.inl @@ -464,7 +464,7 @@ void SpringForceField::initializeTopologyHandler(sofa::core::topology d_springs.cleanDirty(); //Clean the indices list of the unmodified topology to match the size of the newly modified one updateTopologyIndicesFromSprings(); - //Clean dirtyness of springs because we just updated the indices lists from the spring data itself + //Clean dirtiness of springs because we just updated the indices lists from the spring data itself d_springs.cleanDirty(); areSpringIndicesDirty = false; } diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h index 78958b129ba..b57362f1233 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/TriangularBendingSprings.h @@ -165,7 +165,7 @@ class TriangularBendingSprings : public core::behavior::ForceField sofa::core::topology::EdgeData >& getEdgeInfo() { return d_edgeInfo; } protected: - /// poential energy accumulate in method @sa addForce + /// potential energy accumulate in method @sa addForce SReal m_potentialEnergy; /// Pointer to the linked topology used to create this spring forcefield diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h index 9ecaa14c21c..c8f7660ca1e 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.h @@ -121,7 +121,7 @@ class VectorSpringForceField: public core::behavior::PairInteractionForceField d_viscosity; - Data d_useTopology; ///< Activate/Desactivate topology mode of the component (springs on each edge) + Data d_useTopology; ///< Activate/Deactivate topology mode of the component (springs on each edge) /// Link to be set to the topology container in the component graph. SingleLink, sofa::core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_topology; diff --git a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl index 87ae4305466..83dced16b03 100644 --- a/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl +++ b/Sofa/Component/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/VectorSpringForceField.inl @@ -125,10 +125,10 @@ VectorSpringForceField::VectorSpringForceField(MechanicalState* _obje : Inherit(_object1, _object2) , m_potentialEnergy( 0.0 ), useTopology( false ) , d_springArray(initData(&d_springArray, "springs", "springs data")) - , d_filename(initData(&d_filename, std::string(""), "filename", "File name from which the spring informations are loaded") ) + , d_filename(initData(&d_filename, std::string(""), "filename", "File name from which the spring information are loaded") ) , d_stiffness(initData(&d_stiffness, SReal(1.0), "stiffness", "Default edge stiffness used in absence of file information") ) , d_viscosity(initData(&d_viscosity, SReal(1.0), "viscosity", "Default edge viscosity used in absence of file information") ) - , d_useTopology(initData(&d_useTopology, false, "useTopology", "Activate/Desactivate topology mode of the component (springs on each edge)")) + , d_useTopology(initData(&d_useTopology, false, "useTopology", "Activate/Deactivate topology mode of the component (springs on each edge)")) , l_topology(initLink("topology", "link to the topology container")) , m_topology(nullptr) { diff --git a/Sofa/Component/SolidMechanics/Spring/tests/SpringForceField_test.cpp b/Sofa/Component/SolidMechanics/Spring/tests/SpringForceField_test.cpp index 3b9fbe0a629..9a557f49a77 100644 --- a/Sofa/Component/SolidMechanics/Spring/tests/SpringForceField_test.cpp +++ b/Sofa/Component/SolidMechanics/Spring/tests/SpringForceField_test.cpp @@ -204,16 +204,16 @@ struct SpringForceField_test : public ForceField_test<_SpringForceField> -// ========= Define the list of types to instanciate. +// ========= Define the list of types to instantiate. //using ::testing::Types; typedef ::testing::Types< component::solidmechanics::spring::SpringForceField, // 2D component::solidmechanics::spring::SpringForceField // 3D -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -// ========= Tests to run for each instanciated type +// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(SpringForceField_test, TestTypes); // first test case: extension, no velocity diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h index 202158ef3e7..4734b3db415 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.h @@ -84,7 +84,7 @@ class TetrahedralTensorMassForceField : public core::behavior::ForceField; - VecCoord _initialPoints;///< the intial positions of the points + VecCoord _initialPoints;///< the initial positions of the points bool updateMatrix; diff --git a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h index 359cdabaa78..8593d337670 100644 --- a/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h +++ b/Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TriangularTensorMassForceField.h @@ -119,7 +119,7 @@ class TriangularTensorMassForceField : public core::behavior::ForceField& triangleRemoved); - VecCoord _initialPoints;///< the intial positions of the points + VecCoord _initialPoints;///< the initial positions of the points bool updateMatrix; diff --git a/Sofa/Component/SolidMechanics/Testing/src/sofa/component/solidmechanics/testing/ForceFieldTestCreation.h b/Sofa/Component/SolidMechanics/Testing/src/sofa/component/solidmechanics/testing/ForceFieldTestCreation.h index 6f78003a972..afd471b510b 100644 --- a/Sofa/Component/SolidMechanics/Testing/src/sofa/component/solidmechanics/testing/ForceFieldTestCreation.h +++ b/Sofa/Component/SolidMechanics/Testing/src/sofa/component/solidmechanics/testing/ForceFieldTestCreation.h @@ -50,7 +50,7 @@ namespace sofa { /** @brief Helper for writing ForceField tests. - * The constructor creates a root node and adds it a State and a ForceField (of the paremeter type of this template class). + * The constructor creates a root node and adds it a State and a ForceField (of the parameter type of this template class). * Pointers to node, state and force are available. * Deriving the ForceField test from this class makes it easy to write: just call function run_test with positions, velocities and the corresponding expected forces. * This function automatically checks not only the forces (function addForce), but also the stiffness (methods addDForce and addKToMatrix), using finite differences. @@ -81,7 +81,7 @@ struct ForceField_test : public BaseSimulationTest, NumericTest DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(AffinePatch_sofa_test, DataTypes); // first test case diff --git a/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp b/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp index de8f46f405f..cfe9e1d3e23 100644 --- a/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp +++ b/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp @@ -289,13 +289,13 @@ struct LinearElasticity_test : public sofa::testing::BaseSimulationTest, sofa::t }; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using ::testing::Types; typedef Types< Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(LinearElasticity_test, DataTypes); // first test topology diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h index aafb585be88..6993dbf0f23 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MappedObject.h @@ -32,7 +32,7 @@ namespace sofa::component::statecontainer { //using core::objectmodel::Data; -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class MappedObjectInternalData { diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h index 58aabafb9f2..e1327eaee63 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.h @@ -38,7 +38,7 @@ namespace sofa::component::statecontainer { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class MechanicalObject; diff --git a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.inl b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.inl index 0c745244dc6..c31a21c7c1e 100644 --- a/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.inl +++ b/Sofa/Component/StateContainer/src/sofa/component/statecontainer/MechanicalObject.inl @@ -112,7 +112,7 @@ bool applyPredicateIfCoordOrDeriv(sofa::core::VecType vtype_a, sofa::core::VecTy { if (vtype_b == sofa::core::V_COORD) { - // predicate cannot be applied because vtype_a and vtype_b are imcompatible: + // predicate cannot be applied because vtype_a and vtype_b are incompatible: // it is not permitted to perform operations such as [DERIV] += [COORD] return false; } @@ -1277,7 +1277,7 @@ SReal MechanicalObject::compareVec(core::ConstVecId v, std::istream & error += fabs(value_ref-value_cur); count ++; } - if( count == 0 ) return 0; //both vector are empy, so we return 0; + if( count == 0 ) return 0; //both vector are empty, so we return 0; return error/count; } diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp index f8384eca4a1..5ae461075e0 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp @@ -2362,7 +2362,7 @@ bool MeshTopology::checkConnexity() if (elemAll.size() != nbr) { - msg_error() << "CheckConnexity: elements are missings. There is more than one connexe component."; + msg_error() << "CheckConnexity: elements are missing. There is more than one connexe component."; return false; } diff --git a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h index e9be09e6716..d4b0d37e717 100644 --- a/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h +++ b/Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.h @@ -288,13 +288,13 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_CONSTANT_API MeshTopology : public core: // test whether p0p1 has the same orientation as triangle t - // opposite dirction: return -1 + // opposite direction: return -1 // same direction: return 1 // otherwise: return 0 int computeRelativeOrientationInTri(const PointID ind_p0, const PointID ind_p1, const PointID ind_t); // test whether p0p1 has the same orientation as triangle t - // opposite dirction: return -1 + // opposite direction: return -1 // same direction: return 1 // otherwise: return 0 int computeRelativeOrientationInQuad(const PointID ind_p0, const PointID ind_p1, const PointID ind_q); diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyModifier.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyModifier.cpp index 3f88626577c..c36a9b14d3c 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyModifier.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/DynamicSparseGridTopologyModifier.cpp @@ -53,7 +53,7 @@ void DynamicSparseGridTopologyModifier::init() //TODO// find a solution for this case !!!! Modifier can not access to the DOF and can not compute the indices of the added hexahedra. -// We have to find a way to automaticaly compute the indices of the added hexahedra to update the map 'm_m_DynContainer->idInRegularGrid2Hexa' +// We have to find a way to automatically compute the indices of the added hexahedra to update the map 'm_m_DynContainer->idInRegularGrid2Hexa' void DynamicSparseGridTopologyModifier::addHexahedraProcess ( const sofa::type::vector< Hexahedron > &hexahedra ) { HexahedronSetTopologyModifier::addHexahedraProcess ( hexahedra ); diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.cpp index 6d3de29e77f..15ddadbc529 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.cpp @@ -196,7 +196,7 @@ const EdgeSetTopologyContainer::Edge EdgeSetTopologyContainer::getEdge (EdgeID i } -// Return the number of connected components from the graph containing all edges and give, for each vertex, which component it belongs to (use BOOST GRAPH LIBRAIRY) +// Return the number of connected components from the graph containing all edges and give, for each vertex, which component it belongs to (use BOOST GRAPH LIBRARY) int EdgeSetTopologyContainer::getNumberConnectedComponents(sofa::type::vector& components) { using namespace boost; @@ -274,7 +274,7 @@ bool EdgeSetTopologyContainer::checkConnexity() if (elemAll.size() != nbr) { - msg_warning() << "CheckConnexity: Edges are missings. There is more than one connexe component."; + msg_warning() << "CheckConnexity: Edges are missing. There is more than one connexe component."; return false; } @@ -396,7 +396,7 @@ const EdgeSetTopologyContainer::VecEdgeID EdgeSetTopologyContainer::getElementAr { const EdgesAroundVertex& edgeAV = this->getEdgesAroundVertex(the_edge[i]); if (edgeAV.empty()) { - msg_error() << "No edge found aroud of vertex id: " << the_edge[i] << ". Should at least found edge id: " << elem; + msg_error() << "No edge found around vertex id: " << the_edge[i] << ". Should at least found edge id: " << elem; continue; } diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h index 43832563915..2cf809bbe3a 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyContainer.h @@ -99,7 +99,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API EdgeSetTopologyContainer : p /// Dynamic Topology API /// @{ - /// Method called by component Init method. Will create all the topology neighboorhood buffers. + /// Method called by component Init method. Will create all the topology neighborhood buffers. void initTopology(); /** \brief Checks if the topology is coherent @@ -125,7 +125,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API EdgeSetTopologyContainer : p Size getNumberOfElements() const override; - /** \brief Returns the number of connected components from the graph containing all edges and give, for each vertex, which component it belongs to (use BOOST GRAPH LIBRAIRY) + /** \brief Returns the number of connected components from the graph containing all edges and give, for each vertex, which component it belongs to (use BOOST GRAPH LIBRARY) * * @param components the array containing the optimal vertex permutation according to the Reverse CuthillMckee algorithm * @return The number of components connected together. diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.cpp index 0edd32a39a0..eb65e87a9aa 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.cpp @@ -232,7 +232,7 @@ void EdgeSetTopologyModifier::removeEdgesProcess(const sofa::type::vectorgetNumberOfEdges() - 1; for (size_t i=0; ihasEdgesAroundVertex()) { @@ -270,7 +270,7 @@ void EdgeSetTopologyModifier::removeEdgesProcess(const sofa::type::vector &indices, m_container->checkTopology(); } -// Give the optimal vertex permutation according to the Reverse CuthillMckee algorithm (use BOOST GRAPH LIBRAIRY) +// Give the optimal vertex permutation according to the Reverse CuthillMckee algorithm (use BOOST GRAPH LIBRARY) void EdgeSetTopologyModifier::resortCuthillMckee(sofa::type::vector& inverse_permutation) { using namespace boost; diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h index 6935d7e4062..9a559bb51e0 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h @@ -154,7 +154,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API EdgeSetTopologyModifier : pu const sofa::type::vector< sofa::type::vector< SReal > >& baryCoefs, const bool removeIsolatedPoints = true); - /** \brief Gives the optimal vertex permutation according to the Reverse CuthillMckee algorithm (use BOOST GRAPH LIBRAIRY) + /** \brief Gives the optimal vertex permutation according to the Reverse CuthillMckee algorithm (use BOOST GRAPH LIBRARY) */ virtual void resortCuthillMckee(sofa::type::vector& inverse_permutation); diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.cpp index f9fa154edba..b8fb2b1c268 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.cpp @@ -917,7 +917,7 @@ bool HexahedronSetTopologyContainer::checkConnexity() if (elemAll.size() != nbr) { - msg_warning() << "CheckConnexity: Hexahedra are missings. There is more than one connexe component."; + msg_warning() << "CheckConnexity: Hexahedra are missing. There is more than one connexe component."; return false; } diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.h index 53593618e1d..65238e957a2 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyContainer.h @@ -222,7 +222,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API HexahedronSetTopologyContain /// Dynamic Topology API /// @{ - /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see TriangleSetTopologyContainer::initTopology() + /// Method called by component Init method. Will create all the topology neighborhood buffers and call @see TriangleSetTopologyContainer::initTopology() void initTopology(); /** \brief Checks if the topology is coherent diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyModifier.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyModifier.cpp index 93f8c310868..d1c92d665a1 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyModifier.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/HexahedronSetTopologyModifier.cpp @@ -209,7 +209,7 @@ void HexahedronSetTopologyModifier::addHexahedronProcess(Hexahedron t) addEdgesWarning(sofa::Size(v.size()), v, edgeIndexList); } - // udpate m_edgesInHexahedron + // update m_edgesInHexahedron m_container->m_edgesInHexahedron[hexahedronIndex][edgeIdx]= edgeIndex; // update m_tetrahedraAroundEdge @@ -343,7 +343,7 @@ void HexahedronSetTopologyModifier::removeHexahedraProcess( const sofa::type::ve } } - // now updates the shell information of the edge formely at the end of the array + // now updates the shell information of the edge formerly at the end of the array if( indices[i] < lastHexahedron ) { if(m_container->hasHexahedraAroundVertex()) @@ -378,19 +378,19 @@ void HexahedronSetTopologyModifier::removeHexahedraProcess( const sofa::type::ve { // removes the quadsInHexahedrons from the quadsInHexahedronArray m_container->m_quadsInHexahedron[ indices[i] ] = m_container->m_quadsInHexahedron[ lastHexahedron ]; // overwriting with last valid value. - m_container->m_quadsInHexahedron.resize( lastHexahedron ); // resizing to erase multiple occurence of the hexa. + m_container->m_quadsInHexahedron.resize( lastHexahedron ); // resizing to erase multiple occurrence of the hexa. } if(m_container->hasEdgesInHexahedron()) { // removes the edgesInHexahedrons from the edgesInHexahedronArray m_container->m_edgesInHexahedron[ indices[i] ] = m_container->m_edgesInHexahedron[ lastHexahedron ]; // overwriting with last valid value. - m_container->m_edgesInHexahedron.resize( lastHexahedron ); // resizing to erase multiple occurence of the hexa. + m_container->m_edgesInHexahedron.resize( lastHexahedron ); // resizing to erase multiple occurrence of the hexa. } // removes the hexahedron from the hexahedronArray m_hexahedron[ indices[i] ] = m_hexahedron[ lastHexahedron ]; // overwriting with last valid value. - m_hexahedron.resize( lastHexahedron ); // resizing to erase multiple occurence of the hexa. + m_hexahedron.resize( lastHexahedron ); // resizing to erase multiple occurrence of the hexa. } if( (!quadToBeRemoved.empty()) || (!edgeToBeRemoved.empty())) diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.cpp index 05d4641150b..b9434772f7f 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.cpp @@ -77,7 +77,7 @@ void QuadSetTopologyContainer::init() void QuadSetTopologyContainer::initTopology() { - // Force creation of Edge Neighboordhood buffers. + // Force creation of Edge Neighborhood buffers. EdgeSetTopologyContainer::initTopology(); // Create triangle cross element buffers. @@ -481,7 +481,7 @@ bool QuadSetTopologyContainer::checkConnexity() if (elemAll.size() != nbr) { - msg_warning() << "CheckConnexity: Quads are missings. There is more than one connexe component."; + msg_warning() << "CheckConnexity: Quads are missing. There is more than one connexe component."; return false; } diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h index b25cba577c4..54a78981e3a 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h @@ -144,7 +144,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API QuadSetTopologyContainer : p /// Dynamic Topology API /// @{ - /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::initTopology() + /// Method called by component Init method. Will create all the topology neighborhood buffers and call @see EdgeSetTopologyContainer::initTopology() void initTopology(); /** \brief Checks if the topology is coherent diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyModifier.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyModifier.cpp index bee7780caa3..a66bcb61dcc 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyModifier.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/QuadSetTopologyModifier.cpp @@ -323,12 +323,12 @@ void QuadSetTopologyModifier::removeQuadsProcess(const sofa::type::vectorhasEdgesInQuad()) { m_container->m_edgesInQuad[ indices[i] ] = m_container->m_edgesInQuad[ lastQuad ]; // overwriting with last valid value. - m_container->m_edgesInQuad.resize( lastQuad ); // resizing to erase multiple occurence of the quad. + m_container->m_edgesInQuad.resize( lastQuad ); // resizing to erase multiple occurrence of the quad. } // removes the quad from the quadArray m_quad[ indices[i] ] = m_quad[ lastQuad ]; // overwriting with last valid value. - m_quad.resize( lastQuad ); // resizing to erase multiple occurence of the quad. + m_quad.resize( lastQuad ); // resizing to erase multiple occurrence of the quad. } if(!edgeToBeRemoved.empty()) diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.inl b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.inl index 27b1395a6c0..95c11dd76af 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.inl +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TetrahedronSetGeometryAlgorithms.inl @@ -1021,7 +1021,7 @@ void TetrahedronSetGeometryAlgorithms::subDivideTetrahedronsWithPlane //Number of to be added points const sofa::Size nbTobeAddedPoints = sofa::Size(intersectedEdgeID.size()*2); - //barycentric coodinates of to be added points + //barycentric coordinates of to be added points sofa::type::vector< sofa::type::vector > ancestors; for(sofa::Index i=0; i::subDivideTetrahedronsWithPlane //Number of to be added points const sofa::Size nbTobeAddedPoints = sofa::Size(intersectedEdgeID.size()*2); - //barycentric coodinates of to be added points + //barycentric coordinates of to be added points sofa::type::vector< sofa::type::vector > ancestors; sofa::type::vector< sofa::type::vector > coefs; for( size_t i=0; i::subDivideRestTetrahedronsWithP //Number of to be added points const sofa::Size nbTobeAddedPoints = sofa::Size(intersectedEdgeID.size()*2); - //barycentric coodinates of to be added points + //barycentric coordinates of to be added points sofa::type::vector< sofa::type::vector > ancestors; for( size_t i=0; i::subDivideRestTetrahedronsWithP //Number of to be added points const sofa::Size nbTobeAddedPoints = sofa::Size(intersectedEdgeID.size()*2); - //barycentric coodinates of to be added points + //barycentric coordinates of to be added points sofa::type::vector< sofa::type::vector > ancestors; sofa::type::vector< sofa::type::vector > coefs; for(sofa::Index i=0; i v; v.push_back(e1); addTrianglesProcess((const sofa::type::vector< Triangle > &) v); @@ -229,7 +229,7 @@ void TetrahedronSetTopologyModifier::addTetrahedronProcess(Tetrahedron t) addEdgesWarning(sofa::Size(v.size()), v, edgeIndexList); } - // udpate m_edgesInTetrahedron + // update m_edgesInTetrahedron m_container->m_edgesInTetrahedron[tetrahedronIndex][j]= edgeIndex; // update m_tetrahedraAroundEdge @@ -363,7 +363,7 @@ void TetrahedronSetTopologyModifier::removeTetrahedraProcess( const sofa::type:: } } - // now updates the shell information of the edge formely at the end of the array + // now updates the shell information of the edge formerly at the end of the array if ( indices[i] < lastTetrahedron ) { if (m_container->hasTetrahedraAroundVertex()) @@ -398,19 +398,19 @@ void TetrahedronSetTopologyModifier::removeTetrahedraProcess( const sofa::type:: { // removes the trianglesInTetrahedrons from the trianglesInTetrahedronArray m_container->m_trianglesInTetrahedron[ indices[i] ] = m_container->m_trianglesInTetrahedron[ lastTetrahedron ]; // overwriting with last valid value. - m_container->m_trianglesInTetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurence of the tetrahedron. + m_container->m_trianglesInTetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurrence of the tetrahedron. } if (m_container->hasEdgesInTetrahedron()) { // removes the edgesInTetrahedrons from the edgesInTetrahedronArray m_container->m_edgesInTetrahedron[ indices[i] ] = m_container->m_edgesInTetrahedron[ lastTetrahedron ]; // overwriting with last valid value. - m_container->m_edgesInTetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurence of the tetrahedron. + m_container->m_edgesInTetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurrence of the tetrahedron. } // removes the tetrahedron from the tetrahedronArray m_tetrahedron[ indices[i] ] = m_tetrahedron[ lastTetrahedron ]; // overwriting with last valid value. - m_tetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurence of the tetrahedron. + m_tetrahedron.resize( lastTetrahedron ); // resizing to erase multiple occurrence of the tetrahedron. } if ( (!triangleToBeRemoved.empty()) || (!edgeToBeRemoved.empty())) diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.cpp index 9953a160abc..7fc9fa74759 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.cpp @@ -37,7 +37,7 @@ void registerTriangleSetGeometryAlgorithms(sofa::core::ObjectFactory* factory) .add< TriangleSetGeometryAlgorithms >()); } -// methods specilizations declaration +// methods specializations declaration template<> SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID pa, Coord& a, PointID pb, Coord& b, sofa::type::vector< sofa::geometry::ElementType>& topoPath_list, diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h index a2808b0050e..b4f0541a94c 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetGeometryAlgorithms.h @@ -271,7 +271,7 @@ class TriangleSetGeometryAlgorithms : public EdgeSetGeometryAlgorithms::InciseAlongLinesList( Real is_snapping_b = is_snap_b0 || is_snap_b1 || is_snap_b2; - if (is_validated) // intersection successfull + if (is_validated) // intersection successful { /// force the creation of TrianglesAroundEdgeArray m_container->getTrianglesAroundEdgeArray(); @@ -3203,7 +3203,7 @@ int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID ind_A, Coor sofa::type::vector< sofa::type::vector > points2Snap; - // Real epsilon = 0.25; // to change to an input for snaping + // Real epsilon = 0.25; // to change to an input for snapping if (epsilonSnapPath != 0.0) SnapAlongPath(intersected_topoElements, intersected_indices, intersected_barycoefs, points2Snap, epsilonSnapPath); @@ -3252,7 +3252,7 @@ int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID ind_A, Coor p_ancestors.resize(p_ancestors.size() - 1); p_baryCoefs.resize(p_baryCoefs.size() - 1); - // For snaping: + // For snapping: if ((epsilonSnapPath != 0.0) || (!points2Snap.empty())) for (size_t j = 0; j < points2Snap.size(); j++) if (points2Snap[j][0] == intersected_indices[i]) @@ -3277,7 +3277,7 @@ int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID ind_A, Coor } if (cptSnap != 3) - msg_error() << "Error: In snaping border, missing elements to compute barycoefs!"; + msg_error() << "Error: In snapping border, missing elements to compute barycoefs!"; break; } @@ -3630,7 +3630,7 @@ int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID ind_A, Coor new_triangles_id.push_back(next_triangle++); - // create two triangles linking p with the splitted edge + // create two triangles linking p with the split edge new_triangles.emplace_back(p2, theTriangleSecond[(edgeInTriangle + 1) % 3], p1); new_triangles_id.push_back(next_triangle++); new_triangles.emplace_back(p2, p1, theTriangleSecond[(edgeInTriangle + 2) % 3]); @@ -3707,7 +3707,7 @@ int TriangleSetGeometryAlgorithms::SplitAlongPath(PointID ind_A, Coor new_triangles_id.push_back(next_triangle++); - // create two triangles linking p with the splitted edge + // create two triangles linking p with the split edge new_triangles.push_back(Triangle(p1, theTriangleFirst[(edgeInTriangle + 1) % 3], p2)); new_triangles_id.push_back(next_triangle++); new_triangles.push_back(Triangle(p1, p2, theTriangleFirst[(edgeInTriangle + 2) % 3])); @@ -4066,7 +4066,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< { PointID Vertex2Snap; - if (intersected_barycoefs[i][0] < epsilon) // This point has to be snaped + if (intersected_barycoefs[i][0] < epsilon) // This point has to be snapped { Vertex2Snap = m_container->getEdge(intersected_indices[i])[0]; it = map_point2snap.find(Vertex2Snap); @@ -4097,7 +4097,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< for (unsigned int j = 0; j < 3; j++) { - if (barycoord[j] > (1.0 - epsilon)) // This point has to be snaped + if (barycoord[j] > (1.0 - epsilon)) // This point has to be snapped { Vertex2Snap = m_container->getTriangleArray()[intersected_indices[i]][j]; it = map_point2snap.find(Vertex2Snap); @@ -4119,7 +4119,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< } } - //// STEP 2 - Test if snaping is needed + //// STEP 2 - Test if snapping is needed if (map_point2snap.empty()) { return; @@ -4128,7 +4128,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< const typename DataTypes::VecCoord& coords = (this->getDOF()->read(core::ConstVecCoordId::position())->getValue()); - //// STEP 3 - Second loop necessary to find object on the neighborhood of a snaped point + //// STEP 3 - Second loop necessary to find object on the neighborhood of a snapped point for (size_t i = 0; i < intersected_indices.size(); i++) { switch (intersected_topoElements[i]) @@ -4200,7 +4200,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< } } - //Pre-treatment to avoid snaping near a border: + //Pre-treatment to avoid snapping near a border: sofa::type::vector field2remove; for (it = map_point2snap.begin(); it != map_point2snap.end(); ++it) { @@ -4221,7 +4221,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< } - //// STEP 4 - Compute new coordinates of point to be snaped, and inform path that point has to be snaped + //// STEP 4 - Compute new coordinates of point to be snapped, and inform path that point has to be snapped field2remove.clear(); points2Snap.resize(map_point2snap.size()); unsigned int cpt = 0; @@ -4243,7 +4243,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< } cpt++; - // Change enum of the first object to snap to POINT, change id and label it as snaped + // Change enum of the first object to snap to POINT, change id and label it as snapped intersected_topoElements[((*it).second)[0]] = sofa::geometry::ElementType::POINT; intersected_indices[((*it).second)[0]] = (*it).first; intersected_barycoefs[((*it).second)[0]][0] = -1.0; @@ -4254,7 +4254,7 @@ void TriangleSetGeometryAlgorithms::SnapAlongPath(sofa::type::vector< } //// STEP 5 - Modify incision path - //TODO: verify that one object can't be snaped and considered at staying at the same time + //TODO: verify that one object can't be snapped and considered at staying at the same time sort(field2remove.begin(), field2remove.end()); for (size_t i = 1; i <= field2remove.size(); i++) //Delete in reverse order diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.cpp index 871f7896046..cfc69119e8c 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.cpp @@ -78,7 +78,7 @@ void TriangleSetTopologyContainer::init() void TriangleSetTopologyContainer::initTopology() { - // Force creation of Edge Neighboordhood buffers. + // Force creation of Edge Neighborhood buffers. EdgeSetTopologyContainer::initTopology(); // Create triangle cross element buffers. @@ -759,7 +759,7 @@ bool TriangleSetTopologyContainer::checkConnexity() if (elemAll.size() != nbr) { - msg_warning() << "CheckConnexity: Triangles are missings. There is more than one connexe component."; + msg_warning() << "CheckConnexity: Triangles are missing. There is more than one connexe component."; return false; } return true; diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h index 22710c5ce15..8c41f4a5ecd 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyContainer.h @@ -151,7 +151,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API TriangleSetTopologyContainer /// Dynamic Topology API /// @{ - /// Method called by component Init method. Will create all the topology neighboorhood buffers and call @see EdgeSetTopologyContainer::initTopology() + /// Method called by component Init method. Will create all the topology neighborhood buffers and call @see EdgeSetTopologyContainer::initTopology() void initTopology(); /** \brief Checks if the topology is coherent diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.cpp b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.cpp index f03f972b45c..23a95daa977 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.cpp @@ -458,12 +458,12 @@ void TriangleSetTopologyModifier::removeTrianglesProcess(const sofa::type::vecto { m_container->m_edgesInTriangle[ indices[i] ] = m_container->m_edgesInTriangle[ lastTriangle ]; // overwriting with last valid value. - m_container->m_edgesInTriangle.resize( lastTriangle ); // resizing to erase multiple occurence of the triangle. + m_container->m_edgesInTriangle.resize( lastTriangle ); // resizing to erase multiple occurrence of the triangle. } // removes the triangle from the triangleArray m_triangle[ indices[i] ] = m_triangle[ lastTriangle ]; // overwriting with last valid value. - m_triangle.resize( lastTriangle ); // resizing to erase multiple occurence of the triangle. + m_triangle.resize( lastTriangle ); // resizing to erase multiple occurrence of the triangle. } removeTrianglesPostProcessing(edgeToBeRemoved, vertexToBeRemoved); // Arrange the current topology. diff --git a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.h b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.h index f1d8189ef6e..7c4357837cb 100644 --- a/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.h +++ b/Sofa/Component/Topology/Container/Dynamic/src/sofa/component/topology/container/dynamic/TriangleSetTopologyModifier.h @@ -255,25 +255,25 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_DYNAMIC_API TriangleSetTopologyModifier - /** \brief Precondition to fulfill before removing triangles. No preconditions are needed in this class. This function should be inplemented in children classes. + /** \brief Precondition to fulfill before removing triangles. No preconditions are needed in this class. This function should be implemented in children classes. * */ virtual bool removeTrianglesPreconditions(const sofa::type::vector< TriangleID >& items); - /**\brief: Postprocessing to apply to topology triangles. Nothing to do in this class. This function should be inplemented in children classes. + /**\brief: Postprocessing to apply to topology triangles. Nothing to do in this class. This function should be implemented in children classes. * */ virtual void removeTrianglesPostProcessing(const sofa::type::vector< TriangleID >& edgeToBeRemoved, const sofa::type::vector< TriangleID >& vertexToBeRemoved ); - /** \brief Precondition to fulfill before adding triangles. No preconditions are needed in this class. This function should be inplemented in children classes. + /** \brief Precondition to fulfill before adding triangles. No preconditions are needed in this class. This function should be implemented in children classes. * */ virtual bool addTrianglesPreconditions(const sofa::type::vector& triangles); - /**\brief: Postprocessing to apply to topology triangles. Nothing to do in this class. This function should be inplemented in children classes. + /**\brief: Postprocessing to apply to topology triangles. Nothing to do in this class. This function should be implemented in children classes. * */ virtual void addTrianglesPostProcessing(const sofa::type::vector& triangles); diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/HexahedronSetTopology_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/HexahedronSetTopology_test.cpp index 96eb5332297..249ebf220ef 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/HexahedronSetTopology_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/HexahedronSetTopology_test.cpp @@ -188,7 +188,7 @@ bool HexahedronSetTopology_test::testQuadBuffers() EXPECT_EQ(elemAQuad[1], 1); - // check QuadsInHexahedron buffer acces + // check QuadsInHexahedron buffer access const sofa::type::vector< HexahedronSetTopologyContainer::QuadsInHexahedron > & quadInHexahedra = topoCon->getQuadsInHexahedronArray(); EXPECT_EQ(quadInHexahedra.size(), nbrHexahedron); @@ -283,7 +283,7 @@ bool HexahedronSetTopology_test::testEdgeBuffers() EXPECT_EQ(elemAEdge[1], 2); - // check EdgesInHexahedron buffer acces + // check EdgesInHexahedron buffer access const sofa::type::vector< HexahedronSetTopologyContainer::EdgesInHexahedron > & edgeInHexahedra = topoCon->getEdgesInHexahedronArray(); EXPECT_EQ(edgeInHexahedra.size(), nbrHexahedron); diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/QuadSetTopology_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/QuadSetTopology_test.cpp index c0b3f5b1984..69412adf9f9 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/QuadSetTopology_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/QuadSetTopology_test.cpp @@ -174,7 +174,7 @@ bool QuadSetTopology_test::testEdgeBuffers() EXPECT_EQ(elemAEdge[1], 1); - // check EdgesInQuad buffer acces + // check EdgesInQuad buffer access const sofa::type::vector< QuadSetTopologyContainer::EdgesInQuad > & edgeInQuads = topoCon->getEdgesInQuadArray(); EXPECT_EQ(edgeInQuads.size(), nbrQuad); diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronNumericalIntegration_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronNumericalIntegration_test.cpp index 7439c68e3b2..19c4cde4a41 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronNumericalIntegration_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronNumericalIntegration_test.cpp @@ -143,13 +143,13 @@ struct TetrahedronNumericalIntegration_test : public NumericTest DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(TetrahedronNumericalIntegration_test, DataTypes); // first test topology diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronSetTopology_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronSetTopology_test.cpp index eba7fec8756..306e5e93eaa 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronSetTopology_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/TetrahedronSetTopology_test.cpp @@ -188,7 +188,7 @@ bool TetrahedronSetTopology_test::testTriangleBuffers() EXPECT_EQ(elemATriangle[1], 1); - // check TrianglesInTetrahedron buffer acces + // check TrianglesInTetrahedron buffer access const sofa::type::vector< TetrahedronSetTopologyContainer::TrianglesInTetrahedron > & triangleInTetrahedra = topoCon->getTrianglesInTetrahedronArray(); EXPECT_EQ(triangleInTetrahedra.size(), nbrTetrahedron); @@ -285,7 +285,7 @@ bool TetrahedronSetTopology_test::testEdgeBuffers() EXPECT_EQ(elemAEdge[3], 3); - // check EdgesInTetrahedron buffer acces + // check EdgesInTetrahedron buffer access const sofa::type::vector< TetrahedronSetTopologyContainer::EdgesInTetrahedron > & edgeInTetrahedra = topoCon->getEdgesInTetrahedronArray(); EXPECT_EQ(edgeInTetrahedra.size(), nbrTetrahedron); diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/TriangleNumericalIntegration_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/TriangleNumericalIntegration_test.cpp index 65c9c4cd2ab..6afa7920a4b 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/TriangleNumericalIntegration_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/TriangleNumericalIntegration_test.cpp @@ -143,13 +143,13 @@ struct TriangleNumericalIntegration_test : public NumericTest DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(TriangleNumericalIntegration_test, DataTypes); // first test topology diff --git a/Sofa/Component/Topology/Container/Dynamic/tests/TriangleSetTopology_test.cpp b/Sofa/Component/Topology/Container/Dynamic/tests/TriangleSetTopology_test.cpp index aa1b19659f4..559485ef6a2 100644 --- a/Sofa/Component/Topology/Container/Dynamic/tests/TriangleSetTopology_test.cpp +++ b/Sofa/Component/Topology/Container/Dynamic/tests/TriangleSetTopology_test.cpp @@ -173,7 +173,7 @@ bool TriangleSetTopology_test::testEdgeBuffers() EXPECT_EQ(triAEdge[1], 15); - // check EdgesInTriangle buffer acces + // check EdgesInTriangle buffer access const sofa::type::vector< TriangleSetTopologyContainer::EdgesInTriangle > & edgeInTriangles = topoCon->getEdgesInTriangleArray(); EXPECT_EQ(edgeInTriangles.size(), nbrTriangle); diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.cpp index d2fadfe0bf8..9529d6b8de3 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.cpp @@ -89,7 +89,7 @@ sofa::type::Vec3 CylinderGridTopology::getPointInGrid(int i, int j, int k) const const int nx = getNx(); const int ny = getNy(); const int nz = getNz(); - // coordonate on a square + // coordinate on a square Vec3 p(i*2*r/(nx-1) - r, j*2*r/(ny-1) - r, 0_sreal); // scale it to be on a circle if (p.norm() > 0.0000001) diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h index 32f15653a07..6c5175d97cb 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/CylinderGridTopology.h @@ -33,7 +33,7 @@ namespace } /** \brief Define a cylinder grid topology - * Paramenters are its @sa d_radius and @sa d_length . + * Parameters are its @sa d_radius and @sa d_length . * Position and direction are set by @sa d_center and @sa d_axis * nz discretisation is along the cylinder axis */ diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h index d066c5c5a7d..d50f7c8f247 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/GridTopology.h @@ -102,7 +102,7 @@ using MeshTopology::getHexahedron; /// Method to compute Point list, called if \sa d_computePointList is true at init. Should be overwritten by children. virtual void computePointList(); - /// Method that will check current grid resolution, if invalide, will set default value: [2; 2; 2] + /// Method that will check current grid resolution, if invalid, will set default value: [2; 2; 2] void checkGridResolution(); /// Internal Method called by \sa checkGridResolution if resolution need to be changed. Should be overwritten by children. diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp index b485ae44b92..cd3a49ba2c9 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.cpp @@ -176,7 +176,7 @@ void SparseGridMultipleTopology::buildAsFinest() if(d_finestConnectivity.getValue() || this->isVirtual || d_nbVirtualFinerLevels.getValue() > 0 ) { - // find the connexion graph between the finest hexahedra + // find the connection graph between the finest hexahedra findConnexionsAtFinestLevel(); } diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h index 8dfe6e7aea6..2f3e6c75206 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridMultipleTopology.h @@ -33,7 +33,7 @@ namespace sofa::component::topology::container::grid /** Build a SparseGridTopology for several given Triangular meshes. -A stiffness coefficient has to be assigned for each mesh. The last found stiffness coefficient is used for an element shared by several meshes => The mesh ordering is important, and so, more specific stiffness informations must appear in last. +A stiffness coefficient has to be assigned for each mesh. The last found stiffness coefficient is used for an element shared by several meshes => The mesh ordering is important, and so, more specific stiffness information must appear in last. */ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridMultipleTopology : public SparseGridRamificationTopology { diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h index 1645a4bac4f..560cd3867f6 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridRamificationTopology.h @@ -30,7 +30,7 @@ namespace sofa::component::topology::container::grid { -/// a SparseGridTopology where each resulting cube contains only one independant connexe component (nodes can be multiplied by using virtual nodes) +/// a SparseGridTopology where each resulting cube contains only one independent connexe component (nodes can be multiplied by using virtual nodes) class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology : public SparseGridTopology { public: @@ -49,7 +49,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology /// as well as deplacements from its first corner in terms of dx, dy, dz (i.e. barycentric coordinates). Index findNearestCube(const type::Vec3& pos, SReal& fx, SReal &fy, SReal &fz) override; - /// one per connexion, in order to compute findCube by beginning by the finnest and by going up until the coarsest parent + /// one per connection, in order to compute findCube by beginning by the finnest and by going up until the coarsest parent void findCoarsestParents(); /// when linking similar particules between neighbors, propagate changes to all the sames particles @@ -60,9 +60,9 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology void buildFromFiner() override; void buildVirtualFinerLevels() override; - /// find the connexion graph between the finest hexahedra + /// find the connection graph between the finest hexahedra void findConnexionsAtFinestLevel(); - /// Once the finest connectivity is computed, some nodes can be dobled + /// Once the finest connectivity is computed, some nodes can be doubled void buildRamifiedFinestLevel(); /// do 2 neighbors cubes share triangles ? bool sharingTriangle(helper::io::Mesh* mesh, Index cubeIdx, Index neighborIdx, unsigned where); @@ -85,7 +85,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology Data d_finestConnectivity; ///< Test for connectivity at the finest level? (more precise but slower by testing all intersections between the model mesh and the faces between boundary cubes) - /// a connexion corresponds to a connexe component in each regular hexa (each non-void hexa has at less one connexion) + /// a connection corresponds to a connexe component in each regular hexa (each non-void hexa has at less one connection) struct Connexion { Connexion():_parent(nullptr), _coarsestParent(0), _hexaIdx(0), _nonRamifiedHexaIdx(0), _tmp(0) {}; @@ -103,10 +103,10 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridRamificationTopology int _tmp; // warning: useful to several algos (as a temporary variable) but it is not an identification number - /// each similar connexion will have a number (saved in _tmp), this number must be given to all connected connexions) + /// each similar connection will have a number (saved in _tmp), this number must be given to all connected connexions) void propagateConnexionNumberToNeighbors( int connexionNumber, const type::vector& allFineConnexions ) { - if (_tmp!=-1) return; // already in an existing connexion number + if (_tmp!=-1) return; // already in an existing connection number _tmp = connexionNumber; for(int i=0; i 0 : dimension of each cell in the created grid")) - , d_nbVirtualFinerLevels(initData(&d_nbVirtualFinerLevels, 0, "nbVirtualFinerLevels", "create virtual (not in the animation tree) finer sparse grids in order to dispose of finest information (usefull to compute better mechanical properties for example)")) + , d_nbVirtualFinerLevels(initData(&d_nbVirtualFinerLevels, 0, "nbVirtualFinerLevels", "create virtual (not in the animation tree) finer sparse grids in order to dispose of finest information (useful to compute better mechanical properties for example)")) , d_dataResolution(initData(&d_dataResolution, type::Vec3i(0, 0, 0), "dataResolution", "Dimension of the voxel File")) , d_voxelSize(initData(&d_voxelSize, type::Vec3(1_sreal, 1_sreal, 1_sreal), "voxelSize", "Dimension of one voxel")) , d_marchingCubeStep(initData(&d_marchingCubeStep, (unsigned int) 1, "marchingCubeStep", "Step of the Marching Cube algorithm")) diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h index 3a7976ad266..52f204d08ad 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SparseGridTopology.h @@ -46,7 +46,7 @@ class RegularGridTopology; /** A sparse grid topology. Like a sparse FFD building from the bounding box of the object. Starting from a RegularGrid, only valid cells containing matter (ie intersecting the original surface mesh or totally inside the object) are considered. * Valid cells are tagged by a Type BOUNDARY or INSIDE - * WARNING: the corresponding node in the XML file has to be placed BEFORE the MechanicalObject node, in order to excute its init() before the MechanicalObject one in order to be able to give dofs + * WARNING: the corresponding node in the XML file has to be placed BEFORE the MechanicalObject node, in order to execute its init() before the MechanicalObject one in order to be able to give dofs */ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public container::constant::MeshTopology { @@ -74,7 +74,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con /// building from a mesh file virtual void buildAsFinest(); - /// building by condensating a finer sparse grid (used if setFinerSparseGrid has initializated _finerSparseGrid before calling init() ) + /// building by condensating a finer sparse grid (used if setFinerSparseGrid has initialized _finerSparseGrid before calling init() ) virtual void buildFromFiner(); /// building eventual virtual finer levels (cf d_nbVirtualFinerLevels) @@ -82,7 +82,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con typedef std::map MapBetweenCornerPositionAndIndice;///< a vertex indice for a given vertex position in space - /// connexion between several coarsened levels + /// connection between several coarsened levels typedef std::vector > HierarchicalCubeMap; ///< a cube indice -> corresponding 8 child indices on the potential _finerSparseGrid HierarchicalCubeMap _hierarchicalCubeMap; typedef type::vector InverseHierarchicalCubeMap; ///< a fine cube indice -> corresponding coarser cube indice @@ -233,7 +233,7 @@ class SOFA_COMPONENT_TOPOLOGY_CONTAINER_GRID_API SparseGridTopology : public con Data< type::Vec3 > d_min; ///< Min Data< type::Vec3 > d_max; ///< Max Data< SReal > d_cellWidth; ///< if > 0 : dimension of each cell in the created grid - Data< int > d_nbVirtualFinerLevels; ///< create virtual (not in the animation tree) finer sparse grids in order to dispose of finest information (usefull to compute better mechanical properties for example) + Data< int > d_nbVirtualFinerLevels; ///< create virtual (not in the animation tree) finer sparse grids in order to dispose of finest information (useful to compute better mechanical properties for example) public: diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.cpp b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.cpp index 39ea54ec88e..6fe13bd1d13 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.cpp +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.cpp @@ -91,7 +91,7 @@ sofa::type::Vec3 SphereGridTopology::getPointInGrid(int i, int j, int k) const const int nx = getNx(); const int ny = getNy(); const int nz = getNz(); - // coordonate on a square + // coordinate on a square type::Vec3 p(i*2*r/(nx-1) - r, j*2*r/(ny-1) - r, k*2*r/(nz-1) - r); // scale it to be on a circle if (p.norm() > 0.0000001){ diff --git a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h index 4f1314ac8d0..db2921627c2 100644 --- a/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h +++ b/Sofa/Component/Topology/Container/Grid/src/sofa/component/topology/container/grid/SphereGridTopology.h @@ -28,7 +28,7 @@ namespace sofa::component::topology::container::grid { /** \brief Define a sphere grid topology - * Paramenters are its @sa d_radius and discretisation . + * Parameters are its @sa d_radius and discretisation . * Position and direction are set by @sa d_center and @sa d_axis * nz discretisation is along the sphere axis */ diff --git a/Sofa/Component/Topology/Container/Grid/tests/RegularGridTopology_test.cpp b/Sofa/Component/Topology/Container/Grid/tests/RegularGridTopology_test.cpp index 6876c86bdb7..61276f31e4d 100644 --- a/Sofa/Component/Topology/Container/Grid/tests/RegularGridTopology_test.cpp +++ b/Sofa/Component/Topology/Container/Grid/tests/RegularGridTopology_test.cpp @@ -86,7 +86,7 @@ bool RegularGridTopology_test::regularGridSize(const std::vector& p, bool f int nbHexa = (nx - 1) * (ny - 1) * (nz - 1); int nbQuads = (nx - 1) * (ny - 1) * nz + (nx - 1) * ny * (nz - 1) + nx * (ny - 1) * (nz - 1); - /// Dimmension invariant assumption + /// Dimension invariant assumption EXPECT_EQ(regGrid->getNbPoints(), nx * ny * nz); if (fromTriangleList) { @@ -99,8 +99,8 @@ bool RegularGridTopology_test::regularGridSize(const std::vector& p, bool f EXPECT_EQ(regGrid->getNbEdges(), nbEgdes); } - /// Compute the dimmension. - const int d = (p[0] == 1) + (p[1] == 1) + (p[2] == 1); /// Check if there is reduced dimmension + /// Compute the dimension. + const int d = (p[0] == 1) + (p[1] == 1) + (p[2] == 1); /// Check if there is reduced dimension const int e = (p[0] <= 0) + (p[1] <= 0) + (p[2] <= 0); /// Check if there is an error if (e == 0) { @@ -211,11 +211,11 @@ TEST_F(RegularGridTopology_test, regularGridFindPoint) //////////////////////////////////////////////////////////////////////////////////////////////////// /// -/// Test on various dimmensions +/// Test on various dimensions /// //////////////////////////////////////////////////////////////////////////////////////////////////// std::vector> dimvalues = { - /// The first three values are for the dimmension of the grid. + /// The first three values are for the dimension of the grid. /// The fourth is to encode if we need to catch a Warning message /// The fith is to indicate that the component should be initialized with /// the default values of diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp index 3a0ff141ab2..5bb3e007d07 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Hexa2TetraTopologicalMapping.cpp @@ -113,7 +113,7 @@ void Hexa2TetraTopologicalMapping::init() } } - // Tesselation of each cube into 6 tetrahedra + // Tessellation of each cube into 6 tetrahedra for (size_t i=0; igetHexahedron(i); diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp index 315dab425f9..d66221835b3 100644 --- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp +++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Tetra2TriangleTopologicalMapping.cpp @@ -199,7 +199,7 @@ void Tetra2TriangleTopologicalMapping::updateTopologicalMappingTopDown() unsigned int lastLocId = iter_last->second; Glob2LocMap[oldGlobTriId] = lastLocId; - if (lastLocId < Loc2GlobVec.size()) // could be maped to an already removed element in loc2Glob + if (lastLocId < Loc2GlobVec.size()) // could be mapped to an already removed element in loc2Glob Loc2GlobVec[lastLocId] = oldGlobTriId; } else @@ -307,7 +307,7 @@ void Tetra2TriangleTopologicalMapping::updateTopologicalMappingTopDown() { BaseMeshTopology::TriangleID lastGlobId = Loc2GlobVec.back(); - // udpate loc2glob array + // update loc2glob array Loc2GlobVec[triLocId] = lastGlobId; Loc2GlobVec.pop_back(); diff --git a/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h b/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h index f513bba1b6d..bdd5bf4c915 100644 --- a/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h +++ b/Sofa/Component/Topology/Testing/src/sofa/component/topology/testing/fake_TopologyScene.h @@ -122,7 +122,7 @@ class fake_TopologyScene return true; } - /// Method to get acces to node containing the meshLoader and the toplogy container. + /// Method to get access to node containing the meshLoader and the topology container. sofa::simulation::Node::SPtr getNode() { return m_root; } private: diff --git a/Sofa/Component/Topology/Utility/tests/TopologyChecker_test.cpp b/Sofa/Component/Topology/Utility/tests/TopologyChecker_test.cpp index 04edd9e5327..2bc9934cb6f 100644 --- a/Sofa/Component/Topology/Utility/tests/TopologyChecker_test.cpp +++ b/Sofa/Component/Topology/Utility/tests/TopologyChecker_test.cpp @@ -41,7 +41,7 @@ using namespace sofa::core::topology; using namespace sofa::simulation; using sofa::component::topology::utility::TopologyChecker; -/** Test TopologyChecker class on different valid and unvalid topology containers +/** Test TopologyChecker class on different valid and invalid topology containers */ struct TopologyChecker_test: public BaseSimulationTest @@ -203,7 +203,7 @@ struct EdgeTopologyChecker_test : TopologyChecker_test // mix edge edges[0][0] = edges[0][1]; - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkEdgeTopology() == false; @@ -233,7 +233,7 @@ struct EdgeTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkEdgeContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkEdgeToVertexCrossContainer() == false; } @@ -328,7 +328,7 @@ struct TriangleTopologyChecker_test : TopologyChecker_test // mix triangle triangles[0][0] = triangles[0][1]; - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkTriangleTopology() == false; @@ -357,7 +357,7 @@ struct TriangleTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkTriangleContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkTriangleToEdgeCrossContainer(), false); // restore good container @@ -423,7 +423,7 @@ struct TriangleTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkTriangleContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkTriangleToVertexCrossContainer(), false); // restore good container @@ -550,7 +550,7 @@ struct QuadTopologyChecker_test : TopologyChecker_test // mix triangle quads[0][0] = quads[0][1]; - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkQuadTopology() == false; @@ -579,7 +579,7 @@ struct QuadTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkQuadContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkQuadToEdgeCrossContainer(), false); // restore good container @@ -642,7 +642,7 @@ struct QuadTopologyChecker_test : TopologyChecker_test // Add triangle without updating cross container quads.push_back(Topology::Quad(0, 2, 4, 8)); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkQuadToVertexCrossContainer(), false); // restore good container @@ -771,7 +771,7 @@ struct TetrahedronTopologyChecker_test : TopologyChecker_test // mix triangle tetra[0][0] = tetra[0][1]; - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkTetrahedronTopology() == false; @@ -799,7 +799,7 @@ struct TetrahedronTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkTetrahedronContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkTetrahedronToTriangleCrossContainer(), false); // restore good container @@ -927,7 +927,7 @@ struct TetrahedronTopologyChecker_test : TopologyChecker_test // Add triangle without updating cross container tetra.push_back(Topology::Tetrahedron(0, 2, 8, 12)); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkTetrahedronToVertexCrossContainer(), false); // restore good container @@ -1055,7 +1055,7 @@ struct HexahedronTopologyChecker_test : TopologyChecker_test // mix triangle hexahedra[0][0] = hexahedra[0][1]; - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); return checker->checkHexahedronTopology() == false; @@ -1083,7 +1083,7 @@ struct HexahedronTopologyChecker_test : TopologyChecker_test // container should be ok EXPECT_EQ(checker->checkHexahedronContainer(), true); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkHexahedronToQuadCrossContainer(), false); // restore good container @@ -1150,7 +1150,7 @@ struct HexahedronTopologyChecker_test : TopologyChecker_test // Add triangle without updating cross container hexa.push_back(Topology::Hexahedron(0, 2, 4, 12, 14, 18, 20, 22)); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkHexahedronToEdgeCrossContainer(), false); // restore good container @@ -1211,7 +1211,7 @@ struct HexahedronTopologyChecker_test : TopologyChecker_test // Add triangle without updating cross container hexa.push_back(Topology::Hexahedron(0, 2, 4, 12, 14, 18, 20, 22)); - // Topology checher should detect an error + // Topology checker should detect an error EXPECT_MSG_EMIT(Error); EXPECT_EQ(checker->checkHexahedronToVertexCrossContainer(), false); // restore good container diff --git a/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.cpp b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.cpp index 2eaec4a0892..abfd5637626 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.cpp +++ b/Sofa/Component/Visual/src/sofa/component/visual/BaseCamera.cpp @@ -861,7 +861,7 @@ bool BaseCameraXMLImportSingleParameter(tinyxml2::XMLElement* root, core::object } else { - msg_error(c) << "Unknown error occured for " << data.getName() << " field."; + msg_error(c) << "Unknown error occurred for " << data.getName() << " field."; return false; } } diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.cpp b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.cpp index 7ebc63a4909..eecafd203b8 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.cpp +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.cpp @@ -303,7 +303,7 @@ void VisualModelImpl::setMesh(helper::io::Mesh &objLoader, bool tex) if (!objLoader.getGroups().empty()) { - // Get informations about the multiple materials + // Get information about the multiple materials helper::WriteAccessor< Data< type::vector > > materials = this->d_materials; helper::WriteAccessor< Data< type::vector > > groups = this->d_groups; materials.resize(objLoader.getMaterials().size()); diff --git a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h index 5596963d1f8..a225821b27d 100644 --- a/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h +++ b/Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.h @@ -359,7 +359,7 @@ class SOFA_COMPONENT_VISUAL_API VisualModelImpl : public core::visual::VisualMod { if (!d_vertPosIdx.getValue().empty()) { - // Splitted vertices for multiple texture or normal coordinates per vertex. + // Split vertices for multiple texture or normal coordinates per vertex. return d_vertices2.getValue(); } diff --git a/Sofa/Component/Visual/tests/VisualModelImpl_test.cpp b/Sofa/Component/Visual/tests/VisualModelImpl_test.cpp index e021c96427e..9ed0c307e46 100644 --- a/Sofa/Component/Visual/tests/VisualModelImpl_test.cpp +++ b/Sofa/Component/Visual/tests/VisualModelImpl_test.cpp @@ -40,13 +40,13 @@ struct VisualModelImpl_test : public ::testing::Test struct StubVisualModelImpl : public component::visual::VisualModelImpl {}; -// Define the list of DataTypes to instanciate +// Define the list of DataTypes to instantiate using testing::Types; typedef Types< defaulttype::Vec3Types -> DataTypes; // the types to instanciate. +> DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(VisualModelImpl_test, DataTypes); template diff --git a/Sofa/GL/Component/Engine/src/sofa/gl/component/engine/TextureInterpolation.h b/Sofa/GL/Component/Engine/src/sofa/gl/component/engine/TextureInterpolation.h index 8fa1af5bc2f..fbed6dd718f 100644 --- a/Sofa/GL/Component/Engine/src/sofa/gl/component/engine/TextureInterpolation.h +++ b/Sofa/GL/Component/Engine/src/sofa/gl/component/engine/TextureInterpolation.h @@ -34,7 +34,7 @@ namespace sofa::gl::component::engine { /** - * This class give texture coordinate in 1D according to an imput state vector. + * This class give texture coordinate in 1D according to an input state vector. */ template class TextureInterpolation : public core::DataEngine diff --git a/Sofa/GL/Component/Engine/tests/TextureInterpolation_DataUpdate.cpp b/Sofa/GL/Component/Engine/tests/TextureInterpolation_DataUpdate.cpp index f2e1507e7de..0193961e44a 100644 --- a/Sofa/GL/Component/Engine/tests/TextureInterpolation_DataUpdate.cpp +++ b/Sofa/GL/Component/Engine/tests/TextureInterpolation_DataUpdate.cpp @@ -36,9 +36,9 @@ namespace sofa { typedef ::testing::Types< TestDataEngine< gl::component::engine::TextureInterpolation > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE(DataEngine_test, TestTypes); //// test number of call to DataEngine::update diff --git a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.cpp b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.cpp index bad8198229f..fa4c6a1f262 100644 --- a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.cpp +++ b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.cpp @@ -45,8 +45,8 @@ OglColorMap::OglColorMap() , d_legendOffset(initData(&d_legendOffset, type::Vec2f(10.0f,5.0f),"legendOffset", "Draw the legend on screen with an x,y offset")) , d_legendTitle(initData(&d_legendTitle,"legendTitle", "Font size of the legend (if any)")) , d_legendSize(initData(&d_legendSize, 11u, "legendSize", "Add a title to the legend")) -, d_min(initData(&d_min,0.0f,"min","min value for drawing the legend without the need to actually use the range with getEvaluator method wich sets the min")) -, d_max(initData(&d_max,0.0f,"max","max value for drawing the legend without the need to actually use the range with getEvaluator method wich sets the max")) +, d_min(initData(&d_min,0.0f,"min","min value for drawing the legend without the need to actually use the range with getEvaluator method which sets the min")) +, d_max(initData(&d_max,0.0f,"max","max value for drawing the legend without the need to actually use the range with getEvaluator method which sets the max")) , d_legendRangeScale(initData(&d_legendRangeScale,1.f,"legendRangeScale","to change the unit of the min/max value of the legend")) , texture(0) { diff --git a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.h b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.h index 703e0a66d2c..8a511c409ad 100644 --- a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.h +++ b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglColorMap.h @@ -57,8 +57,8 @@ class SOFA_GL_COMPONENT_RENDERING2D_API OglColorMap : public sofa::core::visual: Data d_legendOffset; ///< Draw the legend on screen with an x,y offset Data d_legendTitle; ///< Font size of the legend (if any) Data d_legendSize; ///< Add a title to the legend - Data d_min; ///< min value for drawing the legend without the need to actually use the range with getEvaluator method wich sets the min - Data d_max; ///< max value for drawing the legend without the need to actually use the range with getEvaluator method wich sets the max + Data d_min; ///< min value for drawing the legend without the need to actually use the range with getEvaluator method which sets the min + Data d_max; ///< max value for drawing the legend without the need to actually use the range with getEvaluator method which sets the max Data d_legendRangeScale; ///< to change the unit of the min/max value of the legend sofa::helper::ColorMap m_colorMap; diff --git a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.cpp b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.cpp index 267ccaefaa0..3fc2f572017 100644 --- a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.cpp +++ b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.cpp @@ -45,7 +45,7 @@ OglLabel::OglLabel(): ,d_y(initData(&d_y, (unsigned int)10, "y", "The y position of the text on the screen")) ,d_fontsize(initData(&d_fontsize, (unsigned int)14, "fontsize", "The size of the font used to display the text on the screen")) ,d_color(initData(&d_color, sofa::type::RGBAColor::gray(), "color", "The color of the text to display. (default='gray')")) - ,d_selectContrastingColor(initData(&d_selectContrastingColor, false, "selectContrastingColor", "Overide the color value but one that contrast with the background color")) + ,d_selectContrastingColor(initData(&d_selectContrastingColor, false, "selectContrastingColor", "Override the color value but one that contrast with the background color")) ,d_updateLabelEveryNbSteps(initData(&d_updateLabelEveryNbSteps, (unsigned int)0, "updateLabelEveryNbSteps", "Update the display of the label every nb of time steps")) ,m_stepCounter(0) { @@ -84,7 +84,7 @@ void OglLabel::reinit() { if( d_selectContrastingColor.isSet() && d_color.isSet() ){ msg_warning() << "The selectContrastingColor and color attributes are both set. " << msgendl - << "The color attribute will be overriden by the contrasting color. "; + << "The color attribute will be overridden by the contrasting color. "; } m_internalLabel = d_label.getValue(); diff --git a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.h b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.h index aa972c8a07d..b13963cba9e 100644 --- a/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.h +++ b/Sofa/GL/Component/Rendering2D/src/sofa/gl/component/rendering2d/OglLabel.h @@ -47,7 +47,7 @@ class SOFA_GL_COMPONENT_RENDERING2D_API OglLabel : public core::visual::VisualMo Data d_y; ///< The y position of the text on the screen Data d_fontsize; ///< The size of the font used to display the text on the screen Data d_color; ///< The color of the text to display. (default='gray') - Data d_selectContrastingColor ; ///< Overide the color value but one that contrast with the background color + Data d_selectContrastingColor ; ///< Override the color value but one that contrast with the background color Data d_updateLabelEveryNbSteps; ///< Update the display of the label every nb of time steps core::objectmodel::lifecycle::RemovedData d_visible {this, "v23.06", "23.12", "visible", "Use the 'enable' data field instead of 'visible'"}; diff --git a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp index ce44d6fd5f6..67003a663e8 100644 --- a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp +++ b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.cpp @@ -53,7 +53,7 @@ OglModel::OglModel() , pointSize(initData(&pointSize, 1.0f, "pointSize", "Point size (set if != 1, only for points rendering)")) , lineSmooth(initData(&lineSmooth, false, "lineSmooth", "Enable smooth line rendering")) , pointSmooth(initData(&pointSmooth, false, "pointSmooth", "Enable smooth point rendering")) - , primitiveType( initData(&primitiveType, "primitiveType", "Select types of primitives to send (necessary for some shader types such as geometry or tesselation)")) + , primitiveType( initData(&primitiveType, "primitiveType", "Select types of primitives to send (necessary for some shader types such as geometry or tessellation)")) , blendEquation( initData(&blendEquation, "blendEquation", "if alpha blending is enabled this specifies how source and destination colors are combined") ) , sourceFactor( initData(&sourceFactor, "sfactor", "if alpha blending is enabled this specifies how the red, green, blue, and alpha source blending factors are computed") ) , destFactor( initData(&destFactor, "dfactor", "if alpha blending is enabled this specifies how the red, green, blue, and alpha destination blending factors are computed") ) @@ -1051,7 +1051,7 @@ GLenum OglModel::getGLenum(const char* c ) const { return GL_ONE_MINUS_SRC_ALPHA; } - // .... add ohter OGL symbolic constants + // .... add other OGL symbolic constants // glBlendEquation Value else if ( strcmp( c, "GL_FUNC_ADD") == 0) { diff --git a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h index f93b0d070e5..d5ff3338b15 100644 --- a/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h +++ b/Sofa/GL/Component/Rendering3D/src/sofa/gl/component/rendering3d/OglModel.h @@ -66,7 +66,7 @@ class SOFA_GL_COMPONENT_RENDERING3D_API OglModel : public sofa::component::visua DeprecatedAndRemoved isEnabled; // primitive types - Data primitiveType; ///< Select types of primitives to send (necessary for some shader types such as geometry or tesselation) + Data primitiveType; ///< Select types of primitives to send (necessary for some shader types such as geometry or tessellation) //alpha blend function Data blendEquation; ///< if alpha blending is enabled this specifies how source and destination colors are combined diff --git a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp index 839f23d3846..f9d837f0536 100644 --- a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp +++ b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.cpp @@ -66,9 +66,9 @@ Light::Light() , d_shadowsEnabled(initData(&d_shadowsEnabled, (bool) true, "shadowsEnabled", "[Shadowing] Enable Shadow from this light")) , d_softShadows(initData(&d_softShadows, (bool) false, "softShadows", "[Shadowing] Turn on Soft Shadow from this light")) , d_shadowFactor(initData(&d_shadowFactor, (float) 1.0, "shadowFactor", "[Shadowing] Shadow Factor (decrease/increase darkness)")) - , d_VSMLightBleeding(initData(&d_VSMLightBleeding, (float) 0.05, "VSMLightBleeding", "[Shadowing] (VSM only) Light bleeding paramter")) + , d_VSMLightBleeding(initData(&d_VSMLightBleeding, (float) 0.05, "VSMLightBleeding", "[Shadowing] (VSM only) Light bleeding parameter")) , d_VSMMinVariance(initData(&d_VSMMinVariance, (float) 0.001, "VSMMinVariance", "[Shadowing] (VSM only) Minimum variance parameter")) - , d_textureUnit(initData(&d_textureUnit, (unsigned short) 1, "textureUnit", "[Shadowing] Texture unit for the genereated shadow texture")) + , d_textureUnit(initData(&d_textureUnit, (unsigned short) 1, "textureUnit", "[Shadowing] Texture unit for the generated shadow texture")) , d_modelViewMatrix(initData(&d_modelViewMatrix, "modelViewMatrix", "[Shadowing] ModelView Matrix")) , d_projectionMatrix(initData(&d_projectionMatrix, "projectionMatrix", "[Shadowing] Projection Matrix")) , b_needUpdate(false) @@ -443,7 +443,7 @@ void DirectionalLight::computeOpenGLModelViewMatrix(GLfloat mat[16], const sofa: //2-compute orientation to fit the bbox from light's pov - // bounding box in light space = frustrum + // bounding box in light space = frustum const double epsilon = 0.0000001; Vec3 zAxis = -direction; zAxis.normalize(); diff --git a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.h b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.h index c1c2ebee029..8577dd8f04c 100644 --- a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.h +++ b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/Light.h @@ -79,9 +79,9 @@ class SOFA_GL_COMPONENT_SHADER_API Light : public sofa::core::visual::VisualMode Data d_shadowsEnabled; ///< [Shadowing] Enable Shadow from this light Data d_softShadows; ///< [Shadowing] Turn on Soft Shadow from this light Data d_shadowFactor; ///< [Shadowing] Shadow Factor (decrease/increase darkness) - Data d_VSMLightBleeding; ///< [Shadowing] (VSM only) Light bleeding paramter + Data d_VSMLightBleeding; ///< [Shadowing] (VSM only) Light bleeding parameter Data d_VSMMinVariance; ///< [Shadowing] (VSM only) Minimum variance parameter - Data d_textureUnit; ///< [Shadowing] Texture unit for the genereated shadow texture + Data d_textureUnit; ///< [Shadowing] Texture unit for the generated shadow texture protected: Light(); diff --git a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/LightManager.cpp b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/LightManager.cpp index ec5f7abdb1e..6221add5f0c 100644 --- a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/LightManager.cpp +++ b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/LightManager.cpp @@ -99,7 +99,7 @@ void LightManager::doInitVisual(const core::visual::VisualParams* vparams) m_shadowShaders[i]->initVisual(vparams); ///TODO: keep trace of all active textures at the same time, with a static factory - ///or something like that to avoid conflics with color texture declared in the scene file. + ///or something like that to avoid conflicts with color texture declared in the scene file. type::vector sceneTextures; this->getContext()->get >(&sceneTextures, BaseContext::SearchRoot); @@ -477,7 +477,7 @@ void LightManager::restoreDefaultLight(VisualParams* vp) //TODO(dmarchal): Hard-coding keyboard behavior in a component is a bad idea as for several reasons: // the scene can be executed without a keyboard ...there is no reason the component should have a "knowledge" of keyboard // what will happens if multiple lighmanager are in the same scene ... -// what will hapen if other component use the same key... +// what will happen if other component use the same key... // The correct implementation consist in separatng the event code into a different class & component in // the SofaInteracton module. void LightManager::handleEvent(sofa::core::objectmodel::Event* event) diff --git a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/VisualManagerPass.cpp b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/VisualManagerPass.cpp index 425f1e70849..25e1607d724 100644 --- a/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/VisualManagerPass.cpp +++ b/Sofa/GL/Component/Shader/src/sofa/gl/component/shader/VisualManagerPass.cpp @@ -167,7 +167,7 @@ void VisualManagerPass::postDrawScene(VisualParams* /*vp*/) } -//keyboard event management. Not sure what I'm gonna do with that for the moment, but I'm quite sure it should be usefull in the future +//keyboard event management. Not sure what I'm gonna do with that for the moment, but I'm quite sure it should be useful in the future void VisualManagerPass::handleEvent(sofa::core::objectmodel::Event* /*event*/) { } diff --git a/Sofa/GL/src/sofa/gl/BasicShapes.h b/Sofa/GL/src/sofa/gl/BasicShapes.h index 94f930dcc7c..4a6ee3c72c7 100644 --- a/Sofa/GL/src/sofa/gl/BasicShapes.h +++ b/Sofa/GL/src/sofa/gl/BasicShapes.h @@ -60,7 +60,7 @@ void drawCone(const V& p1, const V& p2, const float& radius1, const float& radiu ct = (float)cos(theta); /* construct normal */ tmp = p*ct+q*st; - /* set the normal for the two subseqent points */ + /* set the normal for the two subsequent points */ gl::glNormalT(tmp); /* point on disk 1 */ V w(p1); diff --git a/Sofa/GL/src/sofa/gl/DrawToolGL.cpp b/Sofa/GL/src/sofa/gl/DrawToolGL.cpp index 79becb03757..7ceb1e45f21 100644 --- a/Sofa/GL/src/sofa/gl/DrawToolGL.cpp +++ b/Sofa/GL/src/sofa/gl/DrawToolGL.cpp @@ -518,7 +518,7 @@ void DrawToolGL::drawCapsule(const Vec3& p1, const Vec3 &p2, float radius,const const float ct = cos(theta); /* construct normal */ tmp = p*ct+q*st; - /* set the normal for the two subseqent points */ + /* set the normal for the two subsequent points */ normals.push_back(tmp); Vec3 w(p1); @@ -593,7 +593,7 @@ void DrawToolGL::drawCone(const Vec3& p1, const Vec3 &p2, float radius1, float r const float ct = cos(theta); /* construct normal */ tmp = p*ct+q*st; - /* set the normal for the two subseqent points */ + /* set the normal for the two subsequent points */ normals.push_back(tmp); /* point on disk 1 */ @@ -1015,7 +1015,7 @@ void DrawToolGL::drawTetrahedra(const std::vector &points, const type::RGB const Vec3& p2 = *(it++); const Vec3& p3 = *(it++); - //this->drawTetrahedron(p0,p1,p2,p3,color); // not recommanded as it will call glBegin/glEnd times + //this->drawTetrahedron(p0,p1,p2,p3,color); // not recommended as it will call glBegin/glEnd times this->internalDrawTriangle(p0, p1, p2, cross((p1 - p0), (p2 - p0)), color); this->internalDrawTriangle(p0, p1, p3, cross((p1 - p0), (p3 - p0)), color); this->internalDrawTriangle(p0, p2, p3, cross((p2 - p0), (p3 - p0)), color); @@ -1043,7 +1043,7 @@ void DrawToolGL::drawScaledTetrahedra(const std::vector &points, const typ Vec3 np2 = ((p2 - center)*scale) + center; Vec3 np3 = ((p3 - center)*scale) + center; - //this->drawTetrahedron(p0,p1,p2,p3,color); // not recommanded as it will call glBegin/glEnd times + //this->drawTetrahedron(p0,p1,p2,p3,color); // not recommended as it will call glBegin/glEnd times this->internalDrawTriangle(np0, np1, np2, cross((p1 - p0), (p2 - p0)), color); this->internalDrawTriangle(np0, np1, np3, cross((p1 - p0), (p3 - p0)), color); this->internalDrawTriangle(np0, np2, np3, cross((p2 - p0), (p3 - p0)), color); @@ -1088,7 +1088,7 @@ void DrawToolGL::drawHexahedra(const std::vector &points, const type::RGBA const Vec3& p6 = *(it++); const Vec3& p7 = *(it++); - //this->drawHexahedron(p0,p1,p2,p3,p4,p5,p6,p7,color); // not recommanded as it will call glBegin/glEnd times + //this->drawHexahedron(p0,p1,p2,p3,p4,p5,p6,p7,color); // not recommended as it will call glBegin/glEnd times this->internalDrawQuad(p0, p1, p2, p3, cross((p1 - p0), (p2 - p0)), color); this->internalDrawQuad(p4, p7, p6, p5, cross((p7 - p5), (p6 - p5)), color); this->internalDrawQuad(p1, p0, p4, p5, cross((p0 - p1), (p4 - p1)), color); @@ -1128,7 +1128,7 @@ void DrawToolGL::drawScaledHexahedra(const std::vector &points, const type Vec3 np6 = ((p6 - center)*scale) + center; Vec3 np7 = ((p7 - center)*scale) + center; - //this->drawHexahedron(p0,p1,p2,p3,p4,p5,p6,p7,color); // not recommanded as it will call glBegin/glEnd times + //this->drawHexahedron(p0,p1,p2,p3,p4,p5,p6,p7,color); // not recommended as it will call glBegin/glEnd times this->internalDrawQuad(np0, np1, np2, np3, cross((p1 - p0), (p2 - p0)), color); this->internalDrawQuad(np4, np7, np6, np5, cross((p7 - p5), (p6 - p5)), color); this->internalDrawQuad(np1, np0, np4, np5, cross((p0 - p1), (p4 - p1)), color); diff --git a/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.cpp b/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.cpp index 40e77ff9243..5e1f9f18c2d 100644 --- a/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.cpp +++ b/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.cpp @@ -100,7 +100,7 @@ void BaseViewer::configure(sofa::component::setting::ViewerSetting* viewerConf) setCameraMode(VisualParams::PERSPECTIVE_TYPE); } -//Fonctions needed to take a screenshot +//Functions needed to take a screenshot const std::string BaseViewer::screenshotName() { return ""; diff --git a/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.h b/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.h index 4af8528b375..6fb448907b4 100644 --- a/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.h +++ b/Sofa/GUI/Common/src/sofa/gui/common/BaseViewer.h @@ -86,7 +86,7 @@ class SOFA_GUI_COMMON_API BaseViewer //Allow to configure your viewer using the Sofa Component, ViewerSetting virtual void configure(sofa::component::setting::ViewerSetting* viewerConf); - //Fonctions needed to take a screenshot + //Functions needed to take a screenshot virtual const std::string screenshotName(); virtual void setPrefix(const std::string& prefix, bool prependDirectory = true); virtual void screenshot(const std::string& filename, int compression_level =-1); diff --git a/Sofa/GUI/Common/src/sofa/gui/common/FilesRecentlyOpenedManager.cpp b/Sofa/GUI/Common/src/sofa/gui/common/FilesRecentlyOpenedManager.cpp index 472c7481420..15b7c0fa5cd 100644 --- a/Sofa/GUI/Common/src/sofa/gui/common/FilesRecentlyOpenedManager.cpp +++ b/Sofa/GUI/Common/src/sofa/gui/common/FilesRecentlyOpenedManager.cpp @@ -70,7 +70,7 @@ void FilesRecentlyOpenedManager::openFile(const std::string &path) if (path.empty() || !FileSystem::exists(path)) return; - // Remove previous occurence of the file, if any + // Remove previous occurrence of the file, if any const type::vector::iterator fileFound = std::find(files.begin(), files.end(), path); if (fileFound != files.end()) files.erase(fileFound); diff --git a/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h b/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h index 10b8918c268..c6fcb634d9b 100644 --- a/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h +++ b/Sofa/GUI/Common/src/sofa/gui/common/GUIManager.h @@ -56,8 +56,8 @@ class SOFA_GUI_COMMON_API GUIManager * \param name : It is the name of your gui. This name is compared with the name parameter when you set GUIManager::Init(name). It must be the same. * \param creator : The pointer function which call when GUIManager::createGUI() * \param init : The pointer function which call when GUIManager::Init() - * \param priority : If nothing is given as name GUIManager::Init parameter GUIManager::valid_guiname is automaticly set compared with the priority - * \return 1 if the name is already used (failed), 0 if restry succed + * \param priority : If nothing is given as name GUIManager::Init parameter GUIManager::valid_guiname is automatically set compared with the priority + * \return 1 if the name is already used (failed), 0 if restry succeed */ static int RegisterGUI(const char* name, CreateGUIFn* creator, RegisterGUIParameters* parameters=nullptr, int priority=0); static const char* GetValidGUIName(); @@ -85,7 +85,7 @@ class SOFA_GUI_COMMON_API GUIManager /// @} protected: /*! - * \brief Comparaison between guiname passed as parameter and all guiname store in guiCreators list + * \brief Comparison between guiname passed as parameter and all guiname store in guiCreators list * \param name : It is the name of your gui. * \return nullptr if the name don't match with any guiCreators name, the correct pointer otherwise */ diff --git a/Sofa/GUI/Component/src/sofa/gui/component/AddRecordedCameraButtonSetting.h b/Sofa/GUI/Component/src/sofa/gui/component/AddRecordedCameraButtonSetting.h index 6702de23cb0..00f8b0ab3f3 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/AddRecordedCameraButtonSetting.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/AddRecordedCameraButtonSetting.h @@ -47,7 +47,7 @@ class SOFA_GUI_COMPONENT_API StartNavigationButtonSetting: public sofa::componen protected: StartNavigationButtonSetting(){}; public: - std::string getOperationType() override {return "Start navigation if some view poins have been saved";} + std::string getOperationType() override {return "Start navigation if some view points have been saved";} }; } // namespace sofa::gui::component diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/InciseAlongPathPerformer.h b/Sofa/GUI/Component/src/sofa/gui/component/performer/InciseAlongPathPerformer.h index 54a18477bcb..77c90bdbce0 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/InciseAlongPathPerformer.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/InciseAlongPathPerformer.h @@ -75,7 +75,7 @@ class SOFA_GUI_COMPONENT_API InciseAlongPathPerformer: public InteractionPerform void setPerformerFreeze() override; protected: - /// Incision will be perfomed between firstIncisionBody (first point clicked) and firstBody (last point clicked in memory) + /// Incision will be performed between firstIncisionBody (first point clicked) and firstBody (last point clicked in memory) void PerformCompleteIncision( ); TopologicalChangeManager topologyChangeManager; diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.cpp b/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.cpp index 7e7d8dbbbca..efa1e80962a 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.cpp +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/InteractionPerformer.cpp @@ -27,6 +27,6 @@ namespace sofa::helper { -//explicit instanciation of our factory class. +//explicit instantiation of our factory class. template class SOFA_GUI_COMPONENT_API Factory; } //namespace sofa::helper diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.h b/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.h index 05cef3d25c3..5144b4d023a 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.h @@ -33,7 +33,7 @@ namespace sofa::gui::component::performer { /** Class to configure primitive removal. Several parameters: - * - topologicalOperation: if 0, other parameters arn't use. + * - topologicalOperation: if 0, other parameters aren't use. * 0 = "remove on element" * 1 = "remove a zone of elements" * - volumicMesh: diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.inl b/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.inl index 5dd047b1673..7723b6f0ee9 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.inl +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/RemovePrimitivePerformer.inl @@ -193,7 +193,7 @@ bool RemovePrimitivePerformer::createElementList() sofa::core::topology::TopologicalMapping *topoMap = dynamic_cast(listObject[i]); if (topoMap) { - // Mapping found: 1- looking for volume, 2- looking for surface element on border, 3- looking for correspondant ID element in surfacique mesh + // Mapping found: 1- looking for volume, 2- looking for surface element on border, 3- looking for correspondent ID element in surfacique mesh const sofa::core::topology::BaseMeshTopology::TrianglesInTetrahedron& tetraTri = topo_curr->getTrianglesInTetrahedron(selectedElem[0]); int volTmp = -1; diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.cpp b/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.cpp index 06349604819..e212344d391 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.cpp +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.cpp @@ -462,7 +462,7 @@ bool TopologicalChangeManager::incisionCollisionModel(sofa::core::CollisionEleme { const bool isCut = this->incisionTriangleModel (model, incision.indexTriangle, incision.coordPoint, model, elem.getIndex(), pos, snapingValue, snapingBorderValue); - if (isCut && !incision.firstCut) // cut has been reached, and will possible be continue. Stocking informations. + if (isCut && !incision.firstCut) // cut has been reached, and will possible be continue. Stocking information. { incision.coordPoint[0] = pos[0]; incision.coordPoint[1] = pos[1]; @@ -565,7 +565,7 @@ bool TopologicalChangeManager::incisionTriangleModel(TriangleCollisionModel indices_list; sofa::type::vector< Vec3 > coords2_list; - // Snaping value: input are percentages, we need to transform it as real epsilon value; + // Snapping value: input are percentages, we need to transform it as real epsilon value; const double epsilonSnap = (double)snapingValue/200; const double epsilonBorderSnap = (double)snapingBorderValue/210; // magic number (0.5 is max value and must not be reached, as threshold is compared to barycoord value) diff --git a/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.h b/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.h index 835cf52f4b0..d0bfba3d9c7 100644 --- a/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.h +++ b/Sofa/GUI/Component/src/sofa/gui/component/performer/TopologicalChangeManager.h @@ -55,8 +55,8 @@ class SOFA_GUI_COMPONENT_API TopologicalChangeManager /** Handles Cutting (activated only for a triangular topology) * - * Only one model is given. This function perform incision beetween input point and stocked - * informations. If it is the first point of the incision, these informations are stocked. + * Only one model is given. This function perform incision between input point and stocked + * information. If it is the first point of the incision, these information are stocked. * i.e element index and picked point coordinates. * * \sa incisionTriangleSetTopology @@ -145,7 +145,7 @@ class SOFA_GUI_COMPONENT_API TopologicalChangeManager private: - /// Global variables to register intermediate informations for point to point incision.(incision along one segment in a triangular mesh) + /// Global variables to register intermediate information for point to point incision.(incision along one segment in a triangular mesh) struct Incision { /// Temporary point index for successive incisions diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/DataWidget.h b/Sofa/GUI/Qt/src/sofa/gui/qt/DataWidget.h index 1a1b272e67c..52b9c8f5313 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/DataWidget.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/DataWidget.h @@ -142,7 +142,7 @@ public slots: virtual void setDataReadOnly(bool readOnly) = 0; /// Helper method to give a size. virtual unsigned int sizeWidget() {return 1;} - /// Helper method for colum. + /// Helper method for column. virtual unsigned int numColumnWidget() {return 3;} protected: diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/GUI.ui b/Sofa/GUI/Qt/src/sofa/gui/qt/GUI.ui index 83354b60b5d..fef9ad0c8de 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/GUI.ui +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/GUI.ui @@ -517,7 +517,7 @@ State 2: dirty, in that state the button reflect the fact that the scene graph v - Record the state at each time step in file "dumpState.data" + Record the state at each time step in file "dumpState.data" Dump State diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/GenGraphForm.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/GenGraphForm.cpp index 149ec7f36de..279eca9f45d 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/GenGraphForm.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/GenGraphForm.cpp @@ -424,7 +424,7 @@ void GenGraphForm::taskError(QProcess::ProcessError error) }; const auto it = errorMap.find(error); const auto errorString = it == errorMap.end() ? "unknown" : it->second; - msg_error("GenGraphForm") << "An error occured: " << errorString; + msg_error("GenGraphForm") << "An error occurred: " << errorString; if (error == QProcess::ProcessError::FailedToStart) { diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/GraphDataWidget.h b/Sofa/GUI/Qt/src/sofa/gui/qt/GraphDataWidget.h index 98f71931861..910a20bdbfb 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/GraphDataWidget.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/GraphDataWidget.h @@ -284,7 +284,7 @@ class GraphWidget: public GraphSetting /// y axis pointer QValueAxis* m_axisY; - /// vector of series to be ploted + /// vector of series to be plotted std::map m_curves; data_type currentData; diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/LinkWidget.h b/Sofa/GUI/Qt/src/sofa/gui/qt/LinkWidget.h index db466b051b3..0508f9d9469 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/LinkWidget.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/LinkWidget.h @@ -154,7 +154,7 @@ public slots: virtual bool createWidgets() = 0; /// Helper method to give a size. virtual unsigned int sizeWidget() {return 1;} - /// Helper method for colum. + /// Helper method for column. virtual unsigned int numColumnWidget() {return 3;} protected: diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/ModifyObject.h b/Sofa/GUI/Qt/src/sofa/gui/qt/ModifyObject.h index db6008928f5..95ad164f984 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/ModifyObject.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/ModifyObject.h @@ -61,7 +61,7 @@ typedef struct ModifyObjectFlags bool HIDE_FLAG; //if we allow to hide Datas bool READONLY_FLAG; //if we allow ReadOnly Datas - bool EMPTY_FLAG;//if we allow empty datas + bool EMPTY_FLAG;//if we allow empty data bool RESIZABLE_FLAG; bool REINIT_FLAG; bool LINKPATH_MODIFIABLE_FLAG; //if we allow to modify the links of the Data diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QDataDescriptionWidget.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/QDataDescriptionWidget.cpp index d2d75f0023c..491de6d3661 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QDataDescriptionWidget.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QDataDescriptionWidget.cpp @@ -174,7 +174,7 @@ QDataDescriptionWidget::QDataDescriptionWidget(QWidget* parent, core::objectmode box->setLayout(boxLayout); - box->setTitle(QString("Extra informations")); + box->setTitle(QString("Extra information")); unsigned int row = 0; for(const auto& data : selecteddatum) diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QGraphStatWidget.h b/Sofa/GUI/Qt/src/sofa/gui/qt/QGraphStatWidget.h index 649fcfc2a8b..9026a1e58a2 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QGraphStatWidget.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QGraphStatWidget.h @@ -77,7 +77,7 @@ class QGraphStatWidget : public QWidget /// Pointer to the chart Data QChart *m_chart; - /// vector of series to be ploted + /// vector of series to be plotted std::vector< QLineSeries *> m_curves; /// x axis pointer diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QModelViewTableDataContainer.h b/Sofa/GUI/Qt/src/sofa/gui/qt/QModelViewTableDataContainer.h index 2e0223e5a84..3745cdc13e7 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QModelViewTableDataContainer.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QModelViewTableDataContainer.h @@ -716,7 +716,7 @@ class vector_data_trait < std::map > //////////////////////////////////////////////////////////////// -/// deques support +/// dequeues support //////////////////////////////////////////////////////////////// template diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QMouseOperations.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/QMouseOperations.cpp index d659b744eba..8d54e1f7244 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QMouseOperations.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QMouseOperations.cpp @@ -196,7 +196,7 @@ QInciseOperation::QInciseOperation() advancedOptions = new QGroupBox(tr("Advanced settings"),this); QVBoxLayout *vbox3 = new QVBoxLayout(advancedOptions); - // first slider for border snaping + // first slider for border snapping QHBoxLayout *slider1=new QHBoxLayout(); QLabel *label1=new QLabel(QString("Distance to snap from border (in %)"), this); snapingBorderSlider=new QSlider(Qt::Horizontal, this); @@ -211,7 +211,7 @@ QInciseOperation::QInciseOperation() slider1->addWidget (snapingBorderValue); vbox3->addLayout (slider1); - // second slider for along path snaping + // second slider for along path snapping QHBoxLayout *slider2=new QHBoxLayout(); QLabel *label2=new QLabel(QString("Distance to snap along path (in %)"), this); snapingSlider=new QSlider(Qt::Horizontal, this); diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.cpp index 227e4c4fc17..d6cd100fa38 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.cpp @@ -62,7 +62,7 @@ QSofaListView::QSofaListView(const SofaListViewAttribute& attribute, this->setObjectName(name); this->setWindowFlags(f); //List of objects - //Read the object.txt that contains the information about the objects which can be added to the scenes whithin a given BoundingBox and scale range + //Read the object.txt that contains the information about the objects which can be added to the scenes within a given BoundingBox and scale range std::string object ( "config/object.txt" ); if( sofa::helper::system::DataRepository.findFile ( object ) ) @@ -153,7 +153,7 @@ void QSofaListView::modifyUnlock(void* Id) map_modifyObjectWindow.erase( Id ); } -/// Traverse the item tree and retrive the item that are expanded. The path of the node +/// Traverse the item tree and retrieve the item that are expanded. The path of the node /// that are expanded are stored in the pathes std::vector::std::string>. void QSofaListView::getExpandedNodes(QTreeWidgetItem* item, std::vector& pathes) { diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.h b/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.h index 46f43df6322..bb1b5f1e66d 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/QSofaListView.h @@ -86,7 +86,7 @@ class SOFA_GUI_QT_API QSofaListView : public SofaSceneGraphWidget /// The view can be visually de-synchronized with the simulation graph. This happens /// when the view is "frozen" for performance reason. In that case, use isDirty to /// get current view state or the dirtynessChanged() signal. - /// To resynchronize the view call the update methid. + /// To resynchronize the view call the update method. void update(); void setRoot(sofa::simulation::Node*); diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp index 9b2cc2cc352..e83572b0a84 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp @@ -275,7 +275,7 @@ void RealGUI::CreateApplication(int /*_argc*/, char** /*_argv*/) application = new QSOFAApplication ( *argc,argv ); //force locale to Standard C - //(must be done immediatly after the QApplication has been created) + //(must be done immediately after the QApplication has been created) const QLocale locale(QLocale::C); QLocale::setDefault(locale); } @@ -436,7 +436,7 @@ RealGUI::RealGUI ( const char* viewername) currentTabChanged ( tabs->currentIndex() ); - createBackgroundGUIInfos(); // add GUI for Background Informations + createBackgroundGUIInfos(); // add GUI for Background Information createWindowVisitor(); diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.h b/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.h index 5ed81682f79..ae82e9f131e 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.h @@ -268,7 +268,7 @@ class SOFA_GUI_QT_API RealGUI : public QMainWindow, public Ui::GUI, public sofa: void startDumpVisitor(); void stopDumpVisitor(); - /// init the viewer for the GUI (embeded or not we have to connect some info about viewer in the GUI) + /// init the viewer for the GUI (embedded or not we have to connect some info about viewer in the GUI) void initViewer(common::BaseViewer* _viewer) override; virtual int exitApplication(unsigned int _retcode = 0) @@ -357,7 +357,7 @@ public slots: virtual void toolsDockMoved(); protected slots: - /// Allow to dynamicly change viewer. Called when click on another viewer in GUI Qt viewer list (see viewerMap). + /// Allow to dynamically change viewer. Called when click on another viewer in GUI Qt viewer list (see viewerMap). /// TODO: find a better way to propagate the argument when we construct the viewer virtual void changeViewer(); @@ -368,7 +368,7 @@ protected slots: /// Update the scenegraph and activate the automatic refresh. virtual void onSceneGraphRefreshButtonClicked(); - /// Update the SceneGraph update button to reflect the dirtyness status. + /// Update the SceneGraph update button to reflect the dirtiness status. virtual void sceneGraphViewDirtynessChanged(bool isDirty); /// Update the SceneGraph update button to reflect the locking status. diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/SimpleDataWidget.h b/Sofa/GUI/Qt/src/sofa/gui/qt/SimpleDataWidget.h index a92eeea905f..8da330398a4 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/SimpleDataWidget.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/SimpleDataWidget.h @@ -852,7 +852,7 @@ class data_widget_trait < ObjectRef > { bool canwrite = d.setPath ( w->text().toStdString() ); if(!canwrite) - msg_info()<<"canot set Path "<text().toStdString()<text().toStdString()< m_exceptions; - SReal m_scaleX; ///< Scale paramater to apply between nodes for display in abscissa. - SReal m_scaleY; ///< Scale paramater to apply between nodes for display in ordinate. + SReal m_scaleX; ///< Scale parameter to apply between nodes for display in abscissa. + SReal m_scaleY; ///< Scale parameter to apply between nodes for display in ordinate. int m_posX; ///< Increment position counter on abscissa for Node display. int m_posY; ///< Increment position counter on ordinate for Node display. diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/SofaWindowProfiler.h b/Sofa/GUI/Qt/src/sofa/gui/qt/SofaWindowProfiler.h index 5901101fe16..8a8b7e42064 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/SofaWindowProfiler.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/SofaWindowProfiler.h @@ -55,9 +55,9 @@ namespace sofa::gui::qt typedef sofa::helper::system::thread::ctime_t ctime_t; /** - * @brief The ProfilerChartView class is a overide of QtCharts::QChartView + * @brief The ProfilerChartView class is a override of QtCharts::QChartView * to be able to catch mouse selection and update all widgets of \sa SofaWindowProfiler - * Will also overide drawForeground to draw a line to show the selected step. + * Will also override drawForeground to draw a line to show the selected step. */ class ProfilerChartView : public QChartView { @@ -69,13 +69,13 @@ class ProfilerChartView : public QChartView void updateYMax(int y) {m_maxY = y;} protected: - /// Overide to catch mouse selection on the graph. + /// Override to catch mouse selection on the graph. virtual void mousePressEvent(QMouseEvent *event); - /// Overide to draw line at the step selected. + /// Override to draw line at the step selected. virtual void drawForeground(QPainter *painter, const QRectF &rect); signals: - /// signal emited when a step has been selected on the graph @param int is the step number + /// signal emitted when a step has been selected on the graph @param int is the step number void pointSelected(int); public slots: @@ -83,7 +83,7 @@ public slots: void updateSelection(int x); protected: - /// copy of the serie size to check if selection is not out of bound + /// copy of the series size to check if selection is not out of bound int m_bufferSize; /// 2D point of the line to draw the selection @@ -101,7 +101,7 @@ public slots: * This class is a QDialog widget to display information recorded by AdvancedTimer mechanism * At each step, info will be gathered from the AdvancedTimer using class sofa::helper::StepData * Info will be displayed by: - * - ploting the step duration into a graph + * - plotting the step duration into a graph * - Showing information duration/step number * - Showing all substep of an animation step with their own duration in ms and the corresponding percentage over the whole step. */ @@ -243,10 +243,10 @@ public slots: /// Buffer of \sa AnimationStepData (data for each step), deque size correspond to \sa m_bufferSize std::deque m_profilingData; - /// Serie of step duration in ms to be plot on the graph. size = \sa m_bufferSize + /// Series of step duration in ms to be plot on the graph. size = \sa m_bufferSize QLineSeries *m_series; - /// Serie of selection substep duration in ms to be plot on the graph. size = \sa m_bufferSize + /// Series of selection substep duration in ms to be plot on the graph. size = \sa m_bufferSize QLineSeries *m_selectionSeries; struct CheckedSeries diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.cpp b/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.cpp index 1897c25a85f..10b28313f20 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.cpp +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.cpp @@ -506,7 +506,7 @@ void SofaViewer::configure(sofa::component::setting::ViewerSetting* viewerConf) } -//Fonctions needed to take a screenshot +//Functions needed to take a screenshot const std::string SofaViewer::screenshotName() { return m_backend->screenshotName(); diff --git a/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.h b/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.h index 355362b9e9a..56c08cd1323 100644 --- a/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.h +++ b/Sofa/GUI/Qt/src/sofa/gui/qt/viewer/SofaViewer.h @@ -76,7 +76,7 @@ class SOFA_GUI_QT_API SofaViewer : public sofa::gui::common::BaseViewer virtual void mouseReleaseEvent ( QMouseEvent * e); virtual bool mouseEvent(QMouseEvent *e); - // Overriden from BaseViewer + // Overridden from BaseViewer virtual void configure(sofa::component::setting::ViewerSetting* viewerConf) override; const std::string screenshotName() override; void setPrefix(const std::string& prefix, bool prependDirectory = true) override; diff --git a/Sofa/framework/Config/CMakeLists.txt b/Sofa/framework/Config/CMakeLists.txt index 91202e1a826..4683959c252 100644 --- a/Sofa/framework/Config/CMakeLists.txt +++ b/Sofa/framework/Config/CMakeLists.txt @@ -26,7 +26,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) ### Sofa using type double or float set(SOFA_FLOATING_POINT_TYPE double CACHE STRING "Type used for floating point values in SOFA. It actually determines: - - what template instanciations will be compiled (via the definition of the + - what template instantiations will be compiled (via the definition of the SOFA_FLOAT and SOFA_DOUBLE macros) - what is the type behind the 'SReal' typedef used throughout SOFA.") set_property(CACHE SOFA_FLOATING_POINT_TYPE PROPERTY STRINGS float double) diff --git a/Sofa/framework/Config/cmake/CompilerOptions.cmake b/Sofa/framework/Config/cmake/CompilerOptions.cmake index f779df89d04..24ffef527cc 100644 --- a/Sofa/framework/Config/cmake/CompilerOptions.cmake +++ b/Sofa/framework/Config/cmake/CompilerOptions.cmake @@ -1,4 +1,4 @@ #### Compiler options ## PR1674: All cmake configuration in Sofa.Config -message(DEPRECATION "CompilerOptions.cmake file is not used anymore, all compiler flags are set in the target Sofa.Config now. Link against it if you want its flags being propagated to your projet. (see PR1674 on github)") +message(DEPRECATION "CompilerOptions.cmake file is not used anymore, all compiler flags are set in the target Sofa.Config now. Link against it if you want its flags being propagated to your project. (see PR1674 on github)") diff --git a/Sofa/framework/Config/cmake/Modules/FindSOFA.cmake b/Sofa/framework/Config/cmake/Modules/FindSOFA.cmake index a1a53bfb117..4b8b3f76e52 100644 --- a/Sofa/framework/Config/cmake/Modules/FindSOFA.cmake +++ b/Sofa/framework/Config/cmake/Modules/FindSOFA.cmake @@ -2,7 +2,7 @@ # In order to use this cmake module, you have to call the find_package(SOFA) command in your CMakeLists.txt # # This module defines for use : -# SOFA_LIBRARIES wich contain all LIBRARIES variables in absolute path of Sofa +# SOFA_LIBRARIES which contain all LIBRARIES variables in absolute path of Sofa # SOFA_FOUND, if false, Sofa not found # SOFA_INCLUDE_DIRS, where to find all the headers # @@ -14,7 +14,7 @@ # #include # # To maintain this script, you just have to : -# * update if necessary the header file and path to search it to find the framwork/moules/application dirs +# * update if necessary the header file and path to search it to find the framework/moules/application dirs # * update if necessary the include dirs for extlibs # * update if necessary name and cmake name of libraries in the corresponding section # * update if necessary the paths to search the libs to the find_lib macro @@ -189,7 +189,7 @@ set(SOFA_INCLUDE_DIRS ## 50 new groups are contained in 5 different categories: ## BASE, COMMON, GENERAL and MISC. ## -## 1- collect all library name to search in the SOFA_LIBS_NAME list splitted into 5 parts +## 1- collect all library name to search in the SOFA_LIBS_NAME list split into 5 parts ## * the SOFA LIBS BASE LIST ## * the SOFA COMMON LIST ## * THE SOFA GENERAL LIST @@ -415,7 +415,7 @@ foreach(index RANGE 0 ${count} 1) math(EXPR indexValue "${index}*2") list(GET SOFA_LIBS_NAME ${indexValue} REAL_SOFA_LIB_NAME) - ## Get the variableName of the coresponding searched library + ## Get the variableName of the corresponding searched library math(EXPR indexName "${index}*2+1") list(GET SOFA_LIBS_NAME ${indexName} CMAKE_SOFA_LIB_NAME) diff --git a/Sofa/framework/Config/cmake/Modules/find_lib.cmake b/Sofa/framework/Config/cmake/Modules/find_lib.cmake index 52e63fc132c..58588c421c3 100644 --- a/Sofa/framework/Config/cmake/Modules/find_lib.cmake +++ b/Sofa/framework/Config/cmake/Modules/find_lib.cmake @@ -31,7 +31,7 @@ set(_FIND_LIB_CMAKE_INCLUDED_ true) ## Optional flag 1: FORCE_DEBUG -> If no DEBUG LIBRARY found, set the debug variable library to the release variable. \\n ## Optional flag 2: FORCE_RELEASE -> If no RELEASE LIBRARY found, set the release variable library to the debug variable. \\n ## Usage 1 : FIND_LIB( ${CMAKE_PROJECT_LIB_NAME} ${REAL_PROJECT_LIB_NAME} ). \\n -## full usage exemple: +## full usage example: ##\\code ## FIND_LIB(${CMAKE_SOFA_LIB_NAME} ${REAL_SOFA_LIB_NAME} \n ## PATHSLIST_DEBUG \n diff --git a/Sofa/framework/Config/cmake/SofaMacrosConfigure.cmake b/Sofa/framework/Config/cmake/SofaMacrosConfigure.cmake index 498c4c3f04b..47574524727 100644 --- a/Sofa/framework/Config/cmake/SofaMacrosConfigure.cmake +++ b/Sofa/framework/Config/cmake/SofaMacrosConfigure.cmake @@ -102,7 +102,7 @@ macro(sofa_add_generic directory name type) string(REPLACE "." "_" option ${option}) string(TOLOWER ${type} type_lower) - # optional parameter to activate/desactivate the option + # optional parameter to activate/deactivate the option # e.g. sofa_add_application( path/MYAPP MYAPP APPLICATION ON) set(active OFF) if(${ARG_DEFAULT_VALUE}) @@ -254,7 +254,7 @@ function(sofa_add_generic_external directory name type) file(APPEND "${fetched_dir}/logs.txt" "${build_logs}") if(generate_exitcode EQUAL 0 AND build_exitcode EQUAL 0 AND EXISTS "${directory}/.git") - message(" Sucess.") + message(" Success.") # Add .gitignore for Sofa file(WRITE "${directory}/.gitignore" "*") # Recover ExternalProjectConfig.cmake.in from build dir (erased by pull) diff --git a/Sofa/framework/Config/cmake/SofaMacrosInstall.cmake b/Sofa/framework/Config/cmake/SofaMacrosInstall.cmake index 260765ae422..096546f9d10 100644 --- a/Sofa/framework/Config/cmake/SofaMacrosInstall.cmake +++ b/Sofa/framework/Config/cmake/SofaMacrosInstall.cmake @@ -781,7 +781,7 @@ function(sofa_set_project_install_relocatable project_name binary_dir install_di set(custom_target ${project_name}_${binary_dirname}_relocatable_install) endif() - # Hack to make installed plugin independant and keep the add_subdirectory mechanism + # Hack to make installed plugin independent and keep the add_subdirectory mechanism # Does not fail if cmakepatch file already exists thanks to "|| true" if(WIN32) set(escaped_dollar "\$\$") diff --git a/Sofa/framework/Config/src/sofa/config.h.in b/Sofa/framework/Config/src/sofa/config.h.in index 4b7d2eba2f8..df763c20356 100644 --- a/Sofa/framework/Config/src/sofa/config.h.in +++ b/Sofa/framework/Config/src/sofa/config.h.in @@ -197,7 +197,7 @@ class DeprecatedAndRemoved {}; "It is still usable but has been DEPRECATED since " deprecateDate ". " \ "You have until " removeDate " to fix your code. " toFixMsg)]] -// The following macro is empty because it is supposed to be used in conjonction +// The following macro is empty because it is supposed to be used in conjunction // when an attribute of type DeprecatedAndRemoved. It should not contain a [[deprecated]] // attribute, because if it does, the "deprecated" warning is showed in every constructor's // for every disabled attribute. diff --git a/Sofa/framework/Core/simutest/CMakeLists.txt b/Sofa/framework/Core/simutest/CMakeLists.txt index 2b811801e36..5ec8342f6b6 100644 --- a/Sofa/framework/Core/simutest/CMakeLists.txt +++ b/Sofa/framework/Core/simutest/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22) project(Sofa.Core_simutest) -# Do not find dependencies explicitely, let CMake decide the appropriate time to do it +# Do not find dependencies explicitly, let CMake decide the appropriate time to do it #sofa_find_package(SofaBase REQUIRED) set(SOURCE_FILES diff --git a/Sofa/framework/Core/simutest/objectmodel/BaseLink_simutest.cpp b/Sofa/framework/Core/simutest/objectmodel/BaseLink_simutest.cpp index 61ba95fe5dd..76da1f529f1 100644 --- a/Sofa/framework/Core/simutest/objectmodel/BaseLink_simutest.cpp +++ b/Sofa/framework/Core/simutest/objectmodel/BaseLink_simutest.cpp @@ -119,7 +119,7 @@ TEST_P(SingleLink_simutest, CheckPath) std::vector> singleLinkValues={ {"@/obj", "The linked type is an InfoComponent type while the link should point to a object. CheckPath should return", "false"}, {"@/child1/mstate1 @/child1/mstate1", "Using multiple link in a SingleLink::CheckPath function should fail and return", "false"}, - {"@../mstate", "The path is not pointing to a valid mstate. CheckLink shoud return", "false"}, + {"@../mstate", "The path is not pointing to a valid mstate. CheckLink should return", "false"}, {"@../mstate1", "The link's target exists and is of same type. CheckPath should return", "true"} }; diff --git a/Sofa/framework/Core/src/sofa/core/BaseMapping.h b/Sofa/framework/Core/src/sofa/core/BaseMapping.h index 832eda56683..d6b0a8a3a01 100644 --- a/Sofa/framework/Core/src/sofa/core/BaseMapping.h +++ b/Sofa/framework/Core/src/sofa/core/BaseMapping.h @@ -108,7 +108,7 @@ class SOFA_CORE_API BaseMapping : public virtual objectmodel::BaseObject /// Return true if the destination model has the same topology as the source model. /// - /// This is the case for mapping keeping a one-to-one correspondance between + /// This is the case for mapping keeping a one-to-one correspondence between /// input and output DOFs (mostly identity or data-conversion mappings). virtual bool sameTopology() const { return false; } diff --git a/Sofa/framework/Core/src/sofa/core/CollisionElement.h b/Sofa/framework/Core/src/sofa/core/CollisionElement.h index 1d5e9b31eea..bb9dcd3cfe8 100644 --- a/Sofa/framework/Core/src/sofa/core/CollisionElement.h +++ b/Sofa/framework/Core/src/sofa/core/CollisionElement.h @@ -297,7 +297,7 @@ inline bool TCollisionElementIterator::isActive(core::CollisionM * collision element. It is only there to create a reference to it, not to * actual contain its data. Classes derived from TCollisionElementIterator * does not store any data, but just provide methods allowing to access the - * additionnal data stored inside the derived CollisionModel. For instance, + * additional data stored inside the derived CollisionModel. For instance, * the Cube class adds the minVect() / maxVect() methods to retrieve the * corners of the cube, however this data is not stored inside Cube, instead * it is stored inside the CubeData class within CubeModel. diff --git a/Sofa/framework/Core/src/sofa/core/ConstraintParams.h b/Sofa/framework/Core/src/sofa/core/ConstraintParams.h index 162f012761e..4b5fcc6c72c 100644 --- a/Sofa/framework/Core/src/sofa/core/ConstraintParams.h +++ b/Sofa/framework/Core/src/sofa/core/ConstraintParams.h @@ -116,9 +116,9 @@ class SOFA_CORE_API ConstraintParams : public sofa::core::ExecParams /// Returns ids of the constraint jacobian matrices MultiMatrixDerivId& j() { return m_j; } - /// Returns ids of the contraint correction vectors + /// Returns ids of the constraint correction vectors const MultiVecDerivId& dx() const { return m_dx; } - /// Returns ids of the contraint correction vectors + /// Returns ids of the constraint correction vectors MultiVecDerivId& dx() { return m_dx; } /// Returns ids of the constraint lambda vectors @@ -177,7 +177,7 @@ class SOFA_CORE_API ConstraintParams : public sofa::core::ExecParams /// Ids of the constraint jacobian matrix MultiMatrixDerivId m_j; - /// Ids of contraint correction vector + /// Ids of constraint correction vector MultiVecDerivId m_dx; /// Ids of constraint lambda vector diff --git a/Sofa/framework/Core/src/sofa/core/DataTrackerCallback.h b/Sofa/framework/Core/src/sofa/core/DataTrackerCallback.h index 043a15e18db..8e1de3045d7 100644 --- a/Sofa/framework/Core/src/sofa/core/DataTrackerCallback.h +++ b/Sofa/framework/Core/src/sofa/core/DataTrackerCallback.h @@ -53,7 +53,7 @@ class SOFA_CORE_API DataTrackerDDGNode : public core::objectmodel::DDGNode /// utility function to ensure all inputs are up-to-date - /// can be useful for particulary complex DDGNode + /// can be useful for particularly complex DDGNode /// with a lot input/output imbricated access void updateAllInputsIfDirty(); @@ -81,7 +81,7 @@ class SOFA_CORE_API DataTrackerDDGNode : public core::objectmodel::DDGNode /// and can be used everywhere. /// /// Note that it contains a DataTracker (m_dataTracker) -/// to be able to check precisly which input changed if needed. +/// to be able to check precisely which input changed if needed. /// /// /// diff --git a/Sofa/framework/Core/src/sofa/core/Mapping.h b/Sofa/framework/Core/src/sofa/core/Mapping.h index 745108ab797..daf5a0b3606 100644 --- a/Sofa/framework/Core/src/sofa/core/Mapping.h +++ b/Sofa/framework/Core/src/sofa/core/Mapping.h @@ -67,13 +67,13 @@ class Mapping : public BaseMapping /// by default rest position are NOT propagated to mapped dofs. /// In some cases, rest pos is needed for mapped dofs (generally when this dof is used to compute mechanics). - /// In that case, Data applyRestPosition must be setted to true for all the mappings until the desired dof. + /// In that case, Data applyRestPosition must be set to true for all the mappings until the desired dof. Data f_applyRestPosition; protected: /// Constructor, taking input and output models as parameters. /// /// Note that if you do not specify these models here, you must call - /// setModels with non-nullptr value before the intialization (i.e. before + /// setModels with non-nullptr value before the initialization (i.e. before /// init() is called). Mapping(State< In >* from=nullptr, State< Out >* to=nullptr); /// Destructor diff --git a/Sofa/framework/Core/src/sofa/core/MechanicalParams.h b/Sofa/framework/Core/src/sofa/core/MechanicalParams.h index 4e39bcbbcca..19bc6dbc685 100644 --- a/Sofa/framework/Core/src/sofa/core/MechanicalParams.h +++ b/Sofa/framework/Core/src/sofa/core/MechanicalParams.h @@ -135,7 +135,7 @@ class SOFA_CORE_API MechanicalParams : public sofa::core::ExecParams MechanicalParams& setSupportOnlySymmetricMatrix(bool b) { m_supportOnlySymmetricMatrix = b; return *this; } #ifndef NDEBUG - /// Checks wether or nor kFactor is used in ForceFields. Temporary here for compatiblity reasons + /// Checks wether or nor kFactor is used in ForceFields. Temporary here for compatibility reasons void setKFactorUsed(bool b) const { m_kFactorUsed = b; } bool getKFactorUsed() const { return m_kFactorUsed; } protected: diff --git a/Sofa/framework/Core/src/sofa/core/Multi2Mapping.inl b/Sofa/framework/Core/src/sofa/core/Multi2Mapping.inl index 1c3005dc4d7..586976046db 100644 --- a/Sofa/framework/Core/src/sofa/core/Multi2Mapping.inl +++ b/Sofa/framework/Core/src/sofa/core/Multi2Mapping.inl @@ -30,7 +30,7 @@ namespace sofa::core template < class In1, class In2, class Out > Multi2Mapping::Multi2Mapping() : fromModels1(initLink("input1", "Input Object(s) (1st Data type)")) - , fromModels2(initLink("input2", "Input Object(s) (2st Data type)")) + , fromModels2(initLink("input2", "Input Object(s) (2nd Data type)")) , toModels(initLink("output", "Output Object(s)")) , f_applyRestPosition( initData( &f_applyRestPosition, false, "applyRestPosition", "set to true to apply this mapping to restPosition at init")) { diff --git a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h index 6dc9a63d3a4..302c70f3590 100644 --- a/Sofa/framework/Core/src/sofa/core/ObjectFactory.h +++ b/Sofa/framework/Core/src/sofa/core/ObjectFactory.h @@ -296,7 +296,7 @@ class ObjectCreator : public ObjectFactory::Creator * \brief Helper class used to register a class in the ObjectFactory. * * This class accumulate information about a given class, as well as creators - * for each supported template instanciation, to register a new entry in + * for each supported template instantiation, to register a new entry in * the ObjectFactory. * * It should be used as a temporary object, finalized when used to initialize @@ -341,7 +341,7 @@ class SOFA_CORE_API ObjectRegistrationData ObjectRegistrationData& addCreator(std::string classname, std::string templatename, ObjectFactory::Creator::SPtr creator); - /// Add a template instanciation of this class. + /// Add a template instantiation of this class. /// /// \param defaultTemplate set to true if this should be the default instance when no template name is given. template diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseAnimationLoop.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseAnimationLoop.h index c9a96fc48dc..9414936eeb3 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseAnimationLoop.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseAnimationLoop.h @@ -34,7 +34,7 @@ namespace sofa::core::behavior * This class can optionally replace the default computation scheme of computing * collisions then doing an integration step. * - * Note that it is in a preliminary stage, hence its fonctionnalities and API will + * Note that it is in a preliminary stage, hence its functionalities and API will * certainly change soon. * */ diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraint.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraint.h index 2827821b4d1..ba176e79f8b 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraint.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseConstraint.h @@ -95,7 +95,7 @@ class SOFA_CORE_API BaseConstraint : public BaseConstraintSet /// Add the corresponding ConstraintResolution using the offset parameter /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) and resolution parameters (smoothness, ...) - /// \param resTab is the result vector that contains the contraint resolution algorithms + /// \param resTab is the result vector that contains the constraint resolution algorithms virtual void getConstraintResolution(const ConstraintParams* cParams, std::vector &resTab, unsigned int &offset); virtual void getConstraintResolution(std::vector &resTab, unsigned int &offset); diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp index 8164313d263..03f74235b4e 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.cpp @@ -105,7 +105,7 @@ void BaseForceField::buildDampingMatrix(DampingMatrix* matrix) if (hasEmittedWarning.insert(this).second) { dmsg_warning() << "buildDampingMatrix not implemented: for compatibility reason, the " - "deprecated API (addBToMatrix) will be used. This compatibility will disapear in the " + "deprecated API (addBToMatrix) will be used. This compatibility will disappear in the " "future, and will cause issues in simulations. Please update the code of " << this->getClassName() << " to ensure right behavior: the function addBToMatrix " "has been replaced by buildDampingMatrix"; diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h index b0e1d0c94fa..4685318ccf1 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseForceField.h @@ -135,7 +135,7 @@ class SOFA_CORE_API BaseForceField : public virtual StateAccessor /// \brief Get the potential energy associated to this ForceField during the /// last call of addForce( const MechanicalParams* mparams ); /// - /// Used to extimate the total energy of the system by some + /// Used to estimate the total energy of the system by some /// post-stabilization techniques. virtual SReal getPotentialEnergy( const MechanicalParams* mparams = mechanicalparams::defaultInstance() ) const=0; /// @} diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseMass.cpp b/Sofa/framework/Core/src/sofa/core/behavior/BaseMass.cpp index 63ff4fe79ad..340ee5a4ae9 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseMass.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseMass.cpp @@ -55,7 +55,7 @@ void BaseMass::buildMassMatrix(sofa::core::behavior::MassMatrixAccumulator* matr if (hasEmittedWarning.insert(this).second) { dmsg_warning() << "buildMassMatrix not implemented: for compatibility reason, the " - "deprecated API (addMToMatrix) will be used. This compatibility will disapear in the " + "deprecated API (addMToMatrix) will be used. This compatibility will disappear in the " "future, and will cause issues in simulations. Please update the code of " << this->getClassName() << " to ensure right behavior: the function addMToMatrix " "has been replaced by buildMassMatrix"; diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BaseProjectiveConstraintSet.cpp b/Sofa/framework/Core/src/sofa/core/behavior/BaseProjectiveConstraintSet.cpp index 8c9bec392dd..8ae2d4f9f37 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BaseProjectiveConstraintSet.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/BaseProjectiveConstraintSet.cpp @@ -33,7 +33,7 @@ void BaseProjectiveConstraintSet::applyConstraint(sofa::core::behavior::ZeroDiri if (hasEmittedWarning.insert(this).second) { dmsg_warning() << "applyConstraint(ZeroDirichletCondition*) not implemented: for compatibility reason, the " - "deprecated API (applyConstraint(MultiMatrixAccessor*)) will be used (without guarantee). This compatibility will disapear in the " + "deprecated API (applyConstraint(MultiMatrixAccessor*)) will be used (without guarantee). This compatibility will disappear in the " "future, and will cause issues in simulations. Please update the code of " << this->getClassName() << " to ensure right behavior: the function applyConstraint(MultiMatrixAccessor*) " "has been replaced by applyConstraint(ZeroDirichletCondition*)"; diff --git a/Sofa/framework/Core/src/sofa/core/behavior/BlockType.h b/Sofa/framework/Core/src/sofa/core/behavior/BlockType.h index c7683421ac0..491fbc94697 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/BlockType.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/BlockType.h @@ -97,7 +97,7 @@ struct BlockType { return blockDataIt->second + "_" + blockPrecisionIt->second; } - return "Unknown bloc type: cannot convert bloc type to string"; + return "Unknown block type: cannot convert block type to string"; } }; diff --git a/Sofa/framework/Core/src/sofa/core/behavior/CRSMultiMatrixAccessor.cpp b/Sofa/framework/Core/src/sofa/core/behavior/CRSMultiMatrixAccessor.cpp index 4ed192633d4..9d4d894a891 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/CRSMultiMatrixAccessor.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/CRSMultiMatrixAccessor.cpp @@ -59,7 +59,7 @@ linearalgebra::BaseMatrix* CRSMultiMatrixAccessor::createMatrix(const sofa::core const sofa::core::behavior::BaseMechanicalState* mstate2, bool doPrintInfo) { - // The auxiliar interaction matrix is added if and only if at least one of two state is not real state + // The auxiliary interaction matrix is added if and only if at least one of two state is not real state //assert(! (realStateOffsets.find(mstate1) != realStateOffsets.end() && realStateOffsets.find(mstate2) != realStateOffsets.end()) ); int nbDOFs1 = mstate1->getSize(); @@ -72,7 +72,7 @@ linearalgebra::BaseMatrix* CRSMultiMatrixAccessor::createMatrix(const sofa::core { msg_info_when(doPrintInfo, "CRSMultiMatrixAccessor") << " ++ Creating matrix Mapped Mechanical State : " << mstate1->getName() << " associated to K[" << mstate1->getMatrixSize() << "x" << mstate1->getMatrixSize() << "] in the format _" - << nbDOFs1 << "x" << nbDOFs1 << "_ of blocs _[" + << nbDOFs1 << "x" << nbDOFs1 << "_ of blocks _[" << dofSize1 << "x" << dofSize1 << "]_"; return createBlocSparseMatrix(dofSize1,dofSize1,sizeof(SReal) /*elementsize*/,nbDOFs1,nbDOFs1,doPrintInfo); @@ -82,7 +82,7 @@ linearalgebra::BaseMatrix* CRSMultiMatrixAccessor::createMatrix(const sofa::core msg_info_when(doPrintInfo, "CRSMultiMatrixAccessor") << " ++ Creating matrix Interaction: " << mstate1->getName() << " -- " << mstate2->getName() << " associated to K[" << mstate1->getMatrixSize() << "x" << mstate2->getMatrixSize() << "] in the format _" - << nbDOFs1 << "x" << nbDOFs2 << "_ of blocs _[" + << nbDOFs1 << "x" << nbDOFs2 << "_ of blocks _[" << dofSize1 << "x" << dofSize2 << "]_"; return createBlocSparseMatrix(dofSize1,dofSize2,sizeof(SReal) /*elementsize*/,nbDOFs1,nbDOFs2,doPrintInfo); } @@ -90,13 +90,13 @@ linearalgebra::BaseMatrix* CRSMultiMatrixAccessor::createMatrix(const sofa::core void CRSMultiMatrixAccessor::computeGlobalMatrix() { - msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << "========================== VERIFICATION BLOC MATRIX FORMATS ========================"; + msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << "========================== VERIFICATION BLOCK MATRIX FORMATS ========================"; for (std::map< const BaseMechanicalState*, MatrixRef >::iterator it = diagonalStiffnessBloc.begin(), itend = diagonalStiffnessBloc.end(); it != itend; ++it) { msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " Mechanical State : " << it->first->getName() << " associated to K[" << it->second.matrix->rowSize() << "x" << it->second.matrix->colSize() << "] in the format _" - << it->second.matrix->bRowSize() << "x" << it->second.matrix->bColSize() << "_ of blocs _[" + << it->second.matrix->bRowSize() << "x" << it->second.matrix->bColSize() << "_ of blocks _[" << it->second.matrix->getBlockRows() << "x" << it->second.matrix->getBlockCols() << "]_"; } @@ -108,7 +108,7 @@ void CRSMultiMatrixAccessor::computeGlobalMatrix() msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " Interaction: " << itBegin->first.first->getName() << " -- " << itBegin->first.second->getName() << " associated to K[" << itBegin->second.matrix->rowSize() << "x" << itBegin->second.matrix->colSize() << "] in the format _" - << itBegin->second.matrix->bRowSize() << "x" << itBegin->second.matrix->bColSize() << "_ of blocs _[" + << itBegin->second.matrix->bRowSize() << "x" << itBegin->second.matrix->bColSize() << "_ of blocks _[" << itBegin->second.matrix->getBlockRows() << "x" << itBegin->second.matrix->getBlockCols() << "]_"; ++itBegin; @@ -124,17 +124,17 @@ void CRSMultiMatrixAccessor::computeGlobalMatrix() msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " " << id << "-th Mapping : " << m_mapping->getName() << " associated to matrix J[" << matrixJ->rowSize() << "x" << matrixJ->colSize() << "] in the format _" - << matrixJ->bRowSize() << "x" << matrixJ->bColSize() << "_ of blocs _[" + << matrixJ->bRowSize() << "x" << matrixJ->bColSize() << "_ of blocks _[" << matrixJ->getBlockRows() << "x" << matrixJ->getBlockCols() << "]_"; msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " inState : " << instate->getName() << " associated to K11[" << instate->getMatrixSize() << "x" << instate->getMatrixSize() << "] in the format _" - << instate->getSize() << "x" << instate->getSize() << "_ of blocs _[" + << instate->getSize() << "x" << instate->getSize() << "_ of blocks _[" << instate->getDerivDimension() << "x" << instate->getDerivDimension() << "]_"; msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " outState : "<< outstate->getName() <<" associated to K11["<< outstate->getMatrixSize() <<"x"<< outstate->getMatrixSize() << "] in the format _" - << outstate->getSize() << "x"<< outstate->getSize() <<"_ of blocs _[" + << outstate->getSize() << "x"<< outstate->getSize() <<"_ of blocks _[" << outstate->getDerivDimension() << "x"<< outstate->getDerivDimension() <<"]_"; } msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << "======================= CONTRIBUTION CONTRIBUTION CONTRIBUTION ======================"; @@ -239,14 +239,14 @@ void CRSMultiMatrixAccessor::computeGlobalMatrix() // I_12 += Jt * I_32 //=========================== const unsigned int offR_I_12 = I_12.offRow; // row offset of I12 matrix - const unsigned int offC_I_12 = I_12.offCol; // colum offset of I12 matrix + const unsigned int offC_I_12 = I_12.offCol; // column offset of I12 matrix const unsigned int nbR_I_12 = I_12.matrix->rowSize() - offR_I_12;//number of rows of I12 matrix - const unsigned int nbC_I_12 = I_12.matrix->colSize() - offC_I_12;//number of colums of I12 matrix + const unsigned int nbC_I_12 = I_12.matrix->colSize() - offC_I_12;//number of columns of I12 matrix const unsigned int offR_I_32 = I_32.offRow; // row offset of I32 matrix - const unsigned int offC_I_32 = I_32.offCol; // colum offset of I32 matrix + const unsigned int offC_I_32 = I_32.offCol; // column offset of I32 matrix const unsigned int nbR_I_32 = I_32.matrix->rowSize() - offR_I_32;//number of rows of I32 matrix - const unsigned int nbC_I_32 = I_32.matrix->colSize() - offC_I_32;//number of colums of I32 matrix + const unsigned int nbC_I_32 = I_32.matrix->colSize() - offC_I_32;//number of columns of I32 matrix msg_info_when(m_doPrintInfo, "CRSMultiMatrixAccessor") << " [Propa.Interac.Stiff] propagating interaction " << outstate->getName() << "--" << interactionList[i].second->getName() diff --git a/Sofa/framework/Core/src/sofa/core/behavior/Constraint.h b/Sofa/framework/Core/src/sofa/core/behavior/Constraint.h index 62ed6dc2294..bc3c0a8ab35 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/Constraint.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/Constraint.h @@ -76,8 +76,8 @@ class Constraint : public BaseConstraint, public SingleStateAccessor /// Construct the Constraint violations vector of each constraint /// /// \param resV is the result vector that contains the whole constraints violations - /// \param x is the position vector used to compute contraint position violation - /// \param v is the velocity vector used to compute contraint velocity violation + /// \param x is the position vector used to compute constraint position violation + /// \param v is the velocity vector used to compute constraint velocity violation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component @@ -95,7 +95,7 @@ class Constraint : public BaseConstraint, public SingleStateAccessor /// /// \param c is the result constraint sparse matrix /// \param cIndex is the index of the next constraint equation: when building the constraint matrix, you have to use this index, and then update it - /// \param x is the position vector used for contraint equation computation + /// \param x is the position vector used for constraint equation computation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component diff --git a/Sofa/framework/Core/src/sofa/core/behavior/ConstraintResolution.h b/Sofa/framework/Core/src/sofa/core/behavior/ConstraintResolution.h index 5140cddd3a3..d099d1e2669 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/ConstraintResolution.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/ConstraintResolution.h @@ -45,7 +45,7 @@ class SOFA_CORE_API ConstraintResolution /// Resolution of the constraint for one Gauss-Seidel iteration virtual void resolution(int line, SReal** w, SReal* d, SReal* force, SReal* dFree); - /// Called after Gauss-Seidel last iteration, in order to store last computed forces for the inital guess + /// Called after Gauss-Seidel last iteration, in order to store last computed forces for the initial guess virtual void store(int /*line*/, SReal* /*force*/, bool /*convergence*/); void setNbLines(unsigned int nbLines) diff --git a/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp b/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp index 26222d2440f..663e94da042 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp +++ b/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp @@ -174,7 +174,7 @@ DefaultMultiMatrixAccessor::MatrixRef DefaultMultiMatrixAccessor::getMatrix(cons r.matrix = itmapped->second; r.offset = 0; } - else // this mapped state and its matrix hasnt been created we creat it and its matrix by "createMatrix" + else // this mapped state and its matrix hasn't been created we creat it and its matrix by "createMatrix" { linearalgebra::BaseMatrix* m = createMatrixImpl(mstate,mstate, m_doPrintInfo); @@ -204,7 +204,7 @@ DefaultMultiMatrixAccessor::MatrixRef DefaultMultiMatrixAccessor::getMatrix(cons DefaultMultiMatrixAccessor::InteractionMatrixRef DefaultMultiMatrixAccessor::getMatrix(const sofa::core::behavior::BaseMechanicalState* mstate1, const sofa::core::behavior::BaseMechanicalState* mstate2) const { InteractionMatrixRef r2; - if (mstate1 == mstate2)// case where state1 == state2, interaction matrix is on the diagonal stiffness bloc + if (mstate1 == mstate2)// case where state1 == state2, interaction matrix is on the diagonal stiffness block { const MatrixRef r = diagonalStiffnessBloc.find(mstate1)->second; r2.matrix = r.matrix; @@ -444,14 +444,14 @@ void DefaultMultiMatrixAccessor::computeGlobalMatrix() // I_12 += Jt * I_32 //=========================== const Index offR_I_12 = I_12.offRow; // row offset of I12 matrix - const Index offC_I_12 = I_12.offCol; // colum offset of I12 matrix + const Index offC_I_12 = I_12.offCol; // column offset of I12 matrix const Index nbR_I_12 = I_12.matrix->rowSize() - offR_I_12;//number of rows of I12 matrix - const Index nbC_I_12 = I_12.matrix->colSize() - offC_I_12;//number of colums of I12 matrix + const Index nbC_I_12 = I_12.matrix->colSize() - offC_I_12;//number of columns of I12 matrix const Index offR_I_32 = I_32.offRow; // row offset of I32 matrix - const Index offC_I_32 = I_32.offCol; // colum offset of I32 matrix + const Index offC_I_32 = I_32.offCol; // column offset of I32 matrix const Index nbR_I_32 = I_32.matrix->rowSize() - offR_I_32;//number of rows of I32 matrix - const Index nbC_I_32 = I_32.matrix->colSize() - offC_I_32;//number of colums of I32 matrix + const Index nbC_I_32 = I_32.matrix->colSize() - offC_I_32;//number of columns of I32 matrix if(m_doPrintInfo)///////////////////////////////////////////////////////// @@ -570,7 +570,7 @@ linearalgebra::BaseMatrix* DefaultMultiMatrixAccessor::createMatrixImpl(const so if(doPrintInfo)///////////////////////////////////////////////////////// { - msg_info("DefaultMultiMatrixAccessor") << " ++ Creating interraction matrix["<< m->rowSize() <<"x"<< m->colSize() + msg_info("DefaultMultiMatrixAccessor") << " ++ Creating interaction matrix["<< m->rowSize() <<"x"<< m->colSize() << "] for interaction " << mstate1->getName() << "[" << mstate1->getMatrixSize() << "] --- " << mstate2->getName() << "[" << mstate2->getMatrixSize()<<"]" ; } diff --git a/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.h b/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.h index 787e2afc597..3dbdd69adee 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.h @@ -32,7 +32,7 @@ namespace sofa::core::behavior * This class allow only cases where there are several Mechanical State on simulation scene * and interactions between them. * - * CRSMultiMatrixAccessor is a more powerfull class managing the global system matrix. + * CRSMultiMatrixAccessor is a more powerful class managing the global system matrix. * This class allow the scene where there are mappings so mapped Mechanical State. It compute * The contribution of stiffness on mapped Mechanical State to the root State related by mapping. * @@ -51,12 +51,12 @@ class SOFA_CORE_API DefaultMultiMatrixAccessor : public sofa::core::behavior::Mu // setting the global matrix for the system. Its size must have the sum of all real Mechanical state virtual void setGlobalMatrix(linearalgebra::BaseMatrix* matrix); - // When a real MS is visited by the visitor, it must be registed in a local data here (realStateOffsets) - // the global size of the system must be ajusted. + // When a real MS is visited by the visitor, it must be registered in a local data here (realStateOffsets) + // the global size of the system must be adjusted. void addMechanicalState(const sofa::core::behavior::BaseMechanicalState* mstate) override; // When a mapping is visited by the visitor, satisfying that is a mechanical mapping - // and having implemented getJ, this mapping must be registed in a local data here (mappingList) + // and having implemented getJ, this mapping must be registered in a local data here (mappingList) void addMechanicalMapping(sofa::core::BaseMapping* mapping) override; //do nothing for instance @@ -89,7 +89,7 @@ class SOFA_CORE_API DefaultMultiMatrixAccessor : public sofa::core::behavior::Mu static linearalgebra::BaseMatrix* createMatrix(const sofa::core::behavior::BaseMechanicalState* mstate1, const sofa::core::behavior::BaseMechanicalState* mstate2); static linearalgebra::BaseMatrix* createMatrixImpl(const sofa::core::behavior::BaseMechanicalState* mstate1, const sofa::core::behavior::BaseMechanicalState* mstate2, bool doPrintInfo); - //Activate/deactive the printing of extra information related to the numerical system that is being solved. + //Activate/deactivate the printing of extra information related to the numerical system that is being solved. void setDoPrintInfo(bool value){ m_doPrintInfo = value; } protected: @@ -120,7 +120,7 @@ class SOFA_CORE_API DefaultMultiMatrixAccessor : public sofa::core::behavior::Mu //by method "getMatrix" in order to fill its matrix mutable std::map< const sofa::core::behavior::BaseMechanicalState*, linearalgebra::BaseMatrix* > mappedMatrices; - //The data structure included mapped and on mapped state, the diagonal stiffness bloc and interaction stiffnessbloc + //The data structure included mapped and on mapped state, the diagonal stiffness block and interaction stiffnessbloc mutable std::map< const sofa::core::behavior::BaseMechanicalState*, MatrixRef > diagonalStiffnessBloc;//todo remove mutable std::map< std::pair, InteractionMatrixRef > interactionStiffnessBloc;//todo remove diff --git a/Sofa/framework/Core/src/sofa/core/behavior/LinearSolver.h b/Sofa/framework/Core/src/sofa/core/behavior/LinearSolver.h index b2403bfcf55..44cf4ce4225 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/LinearSolver.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/LinearSolver.h @@ -115,7 +115,7 @@ class SOFA_CORE_API LinearSolver : public BaseLinearSolver return false; } - /// Apply the contactforce dx = Minv * J^t * f and store the resut in dx VecId + /// Apply the contactforce dx = Minv * J^t * f and store the result in dx VecId virtual void applyConstraintForce(const sofa::core::ConstraintParams* /*cparams*/,sofa::core::MultiVecDerivId /*dx*/, const linearalgebra::BaseVector* /*f*/) { msg_error() << "applyConstraintForce has not been implemented."; } diff --git a/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionConstraint.h b/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionConstraint.h index b36a5d6ef91..d2c82954415 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionConstraint.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionConstraint.h @@ -88,8 +88,8 @@ class MixedInteractionConstraint : public BaseInteractionConstraint, public Pair /// Construct the Constraint violations vector of each constraint /// /// \param v is the result vector that contains the whole constraints violations - /// \param x1 and x2 are the position vectors used to compute contraint position violation - /// \param v1 and v2 are the velocity vectors used to compute contraint velocity violation + /// \param x1 and x2 are the position vectors used to compute constraint position violation + /// \param v1 and v2 are the velocity vectors used to compute constraint velocity violation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component @@ -107,7 +107,7 @@ class MixedInteractionConstraint : public BaseInteractionConstraint, public Pair /// /// \param c1 and c2 are the results constraint sparse matrix /// \param cIndex is the index of the next constraint equation: when building the constraint matrix, you have to use this index, and then update it - /// \param x1 and x2 are the position vectors used for contraint equation computation + /// \param x1 and x2 are the position vectors used for constraint equation computation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component diff --git a/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionForceField.h index e9c0e65950f..8d7ee120809 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/MixedInteractionForceField.h @@ -100,7 +100,7 @@ class MixedInteractionForceField : public BaseInteractionForceField, public Pair /// Get the potential energy associated to this ForceField. /// - /// Used to extimate the total energy of the system by some + /// Used to estimate the total energy of the system by some /// post-stabilization techniques. /// /// This method retrieves the x vector from the MechanicalState and call @@ -137,7 +137,7 @@ class MixedInteractionForceField : public BaseInteractionForceField, public Pair /// Get the potential energy associated to this ForceField. /// - /// Used to extimate the total energy of the system by some + /// Used to estimate the total energy of the system by some /// post-stabilization techniques. /// /// This method must be implemented by the component, and is usually called diff --git a/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.h b/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.h index 52871f0027c..c1b36ddcd9f 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.h @@ -32,7 +32,7 @@ namespace sofa::core::behavior * This class currently control both the integration scheme (explicit, * implicit, static, etc), and the linear system resolution algorithm * (conjugate gradient, matrix direct inversion, etc). Those two aspect will - * propably be separated in a future version. + * probably be separated in a future version. * * While all computations required to do the integration step are handled by * this object, they should not be implemented directly in it, but instead @@ -73,7 +73,7 @@ class SOFA_CORE_API OdeSolver : public virtual objectmodel::BaseObject /// Compute the residual of the newton iteration /// - /// pos_t and vel_t are the position and velocities at the begining of the time step + /// pos_t and vel_t are the position and velocities at the beginning of the time step /// the result is accumulated in Vecid::force() virtual void computeResidual(const core::ExecParams* /*params*/, SReal /*dt*/, sofa::core::MultiVecCoordId /*pos_t*/, sofa::core::MultiVecDerivId /*vel_t*/) { msg_error() << "ComputeResidual is not implemented in " << this->getName(); } diff --git a/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionConstraint.h b/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionConstraint.h index 78aee67f699..1f494cb85aa 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionConstraint.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionConstraint.h @@ -71,8 +71,8 @@ class PairInteractionConstraint : public BaseInteractionConstraint, public PairS /// Construct the Constraint violations vector of each constraint /// /// \param v is the result vector that contains the whole constraints violations - /// \param x1 and x2 are the position vectors used to compute contraint position violation - /// \param v1 and v2 are the velocity vectors used to compute contraint velocity violation + /// \param x1 and x2 are the position vectors used to compute constraint position violation + /// \param v1 and v2 are the velocity vectors used to compute constraint velocity violation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component @@ -90,7 +90,7 @@ class PairInteractionConstraint : public BaseInteractionConstraint, public PairS /// /// \param c1 and c2 are the results constraint sparse matrix /// \param cIndex is the index of the next constraint equation: when building the constraint matrix, you have to use this index, and then update it - /// \param x1 and x2 are the position vectors used for contraint equation computation + /// \param x1 and x2 are the position vectors used for constraint equation computation /// \param cParams defines the state vectors to use for positions and velocities. Also defines the order of the constraint (POS, VEL, ACC) /// /// This is the method that should be implemented by the component diff --git a/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionForceField.h b/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionForceField.h index 063ecb8dada..20db861a697 100644 --- a/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionForceField.h +++ b/Sofa/framework/Core/src/sofa/core/behavior/PairInteractionForceField.h @@ -132,7 +132,7 @@ class PairInteractionForceField : public BaseInteractionForceField, public PairS /// Get the potential energy associated to this ForceField. /// - /// Used to extimate the total energy of the system by some + /// Used to estimate the total energy of the system by some /// post-stabilization techniques. /// /// This method retrieves the x vector from the MechanicalState and call @@ -142,7 +142,7 @@ class PairInteractionForceField : public BaseInteractionForceField, public PairS /// Get the potential energy associated to this ForceField. /// - /// Used to extimate the total energy of the system by some + /// Used to estimate the total energy of the system by some /// post-stabilization techniques. /// /// This method must be implemented by the component, and is usually called diff --git a/Sofa/framework/Core/src/sofa/core/collision/Detection.h b/Sofa/framework/Core/src/sofa/core/collision/Detection.h index 9494405b935..0696e92dfbc 100644 --- a/Sofa/framework/Core/src/sofa/core/collision/Detection.h +++ b/Sofa/framework/Core/src/sofa/core/collision/Detection.h @@ -61,9 +61,9 @@ class Detection : public virtual CollisionAlgorithm { storedIntersectionMethod[instance] = intersectionMethod; intersectionMethod = storedIntersectionMethod[inst]; - // callback overriden by BroadPhaseDetection + // callback overridden by BroadPhaseDetection changeInstanceBP(inst); - // callback overriden by NarrowPhaseDetection + // callback overridden by NarrowPhaseDetection changeInstanceNP(inst); } }; diff --git a/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h b/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h index ab9fc5d1fc7..203c5872ca2 100644 --- a/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h +++ b/Sofa/framework/Core/src/sofa/core/collision/DetectionOutput.h @@ -45,7 +45,7 @@ namespace sofa::core::collision * - deltaT: estimated of time of contact. * * The contact id is used to filter redundant contacts (only the contact with - * the smallest distance is kept), and to store persistant data over time for + * the smallest distance is kept), and to store persistent data over time for * the response. * */ @@ -69,7 +69,7 @@ class DetectionOutput /// Normal of the contact, pointing outward from the first model type::Vec3 normal; /* - /// Signed distance (negative if objects are interpenetrating). If using a proximity-based detection, this is the actual distance between the objets minus the specified contact distance. + /// Signed distance (negative if objects are interpenetrating). If using a proximity-based detection, this is the actual distance between the objects minus the specified contact distance. */ /// Store information for the collision Response. Depending on the kind of contact, can be a distance, or a pression, ... double value; diff --git a/Sofa/framework/Core/src/sofa/core/collision/Intersection.h b/Sofa/framework/Core/src/sofa/core/collision/Intersection.h index 81bfb441f11..f884ab701c8 100644 --- a/Sofa/framework/Core/src/sofa/core/collision/Intersection.h +++ b/Sofa/framework/Core/src/sofa/core/collision/Intersection.h @@ -152,7 +152,7 @@ class SOFA_CORE_API Intersection : public virtual objectmodel::BaseObject /// returns true if algorithm uses proximity detection virtual bool useProximity() const { return false; } - /// returns true if algorithm uses continous detection + /// returns true if algorithm uses continuous detection virtual bool useContinuous() const { return false; } /// Return the alarm distance (must return 0 if useProximity() is false) diff --git a/Sofa/framework/Core/src/sofa/core/fwd.h b/Sofa/framework/Core/src/sofa/core/fwd.h index 69e738489a1..83dcd7fec12 100644 --- a/Sofa/framework/Core/src/sofa/core/fwd.h +++ b/Sofa/framework/Core/src/sofa/core/fwd.h @@ -189,7 +189,7 @@ namespace sofa::core /// These functions are called "opaque" as they work with only forward declaration of the involved /// types in comparison to class methods the requires the full class declaration to be used. /// -/// It is highly recommanded to use as much as possible opaque function in header files as this +/// It is highly recommended to use as much as possible opaque function in header files as this /// allow to reduce the dependency tree. /// /// Opaque function may be slower at runtime (by one function call) but this is true only if LTO isn't diff --git a/Sofa/framework/Core/src/sofa/core/logging/PerComponentLoggingMessageHandler.h b/Sofa/framework/Core/src/sofa/core/logging/PerComponentLoggingMessageHandler.h index 871258f520e..ab4223240c4 100644 --- a/Sofa/framework/Core/src/sofa/core/logging/PerComponentLoggingMessageHandler.h +++ b/Sofa/framework/Core/src/sofa/core/logging/PerComponentLoggingMessageHandler.h @@ -32,7 +32,7 @@ namespace sofa::helper::logging { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. +/// fearing it will leak names into the global namespace. /// When closing this namespace selected objects from this per-file namespace /// are then imported into their parent namespace for ease of use. namespace percomponentloggingmessagehandler diff --git a/Sofa/framework/Core/src/sofa/core/logging/RichConsoleStyleMessageFormatter.h b/Sofa/framework/Core/src/sofa/core/logging/RichConsoleStyleMessageFormatter.h index 9a1d580acfa..8f209be041f 100644 --- a/Sofa/framework/Core/src/sofa/core/logging/RichConsoleStyleMessageFormatter.h +++ b/Sofa/framework/Core/src/sofa/core/logging/RichConsoleStyleMessageFormatter.h @@ -39,7 +39,7 @@ class Message; /// The class implement a message formatter dedicated to console pretty printing on a console /// Among other thing it feature formatting using a markdown like syntax: /// - color rendering, 'italics' or *italics* -/// - alignement and wrapping for long message that are then much easier to read. +/// - alignment and wrapping for long message that are then much easier to read. /// - automatic reading of the console number of column for prettier display. /// /// diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.cpp index ec8e02f265d..3a237e2f2c0 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.cpp @@ -30,10 +30,10 @@ namespace sofa::core::objectmodel /// there is a one to one owner relationship. const BaseData& AbstractDataLink::getOwner() const { return _doGetOwner_(); } -/// Change the targetted DataField +/// Change the targeted DataField void AbstractDataLink::setTarget(BaseData* target){ _doSetTarget_(target); } -/// Get the targetted DataField +/// Get the targeted DataField BaseData* AbstractDataLink::getTarget() const { return _doGetTarget_(); diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.h b/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.h index f15be12782e..41c2abdcc80 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/AbstractDataLink.h @@ -30,7 +30,7 @@ namespace sofa::core::objectmodel class BaseData; /// @brief AbstractDataLink is the base class for every link between two data fields -/// The targetted BaseData is called the "target", +/// The targeted BaseData is called the "target", /// The base object owning the current "child" object is the "owner" /// it is possible to store a path in a DataLink, in that case, at each DataLink access /// the path is resolved to search for a corresponding Data until one is found. @@ -44,10 +44,10 @@ class AbstractDataLink /// A DataLink object has one and only one BaseData as owner. const BaseData& getOwner() const ; - /// Change the targetted DataField and set the path to the empty string + /// Change the targeted DataField and set the path to the empty string void setTarget(BaseData* target); - /// Get the targetted DataField + /// Get the targeted DataField BaseData* getTarget() const; /// Returns true if there is a target @@ -67,10 +67,10 @@ class AbstractDataLink /// If there is no owner set, returns false /// If there is no compatible Data at pointed path, returns false /// Otherwise, returns true. - /// After a successfull call, the path is set to empty string. + /// After a successful call, the path is set to empty string. bool resolvePathAndSetTarget(); - /// Get the targetted DataField + /// Get the targeted DataField /// If there is no path set, returns nullptr /// If there is no owner set, returns nullptr /// If there is no compatible Data at pointed path, returns nullptr @@ -79,7 +79,7 @@ class AbstractDataLink protected: /////////////////////////////////////////////////////////////////////////// - /// The three folowing methods must be implemented by any child class. + /// The three following methods must be implemented by any child class. /// This design delegates to child class the work of actually storing /// the real Data. /// Real implementation for the setTarget() method diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp index df738d145a1..1888327ab0d 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.cpp @@ -54,7 +54,7 @@ Base::Base() : ref_counter(0) , name(initData(&name,unnamed_label,"name","object name")) , f_printLog(initData(&f_printLog, false, "printLog", "if true, emits extra messages at runtime.")) - , f_tags(initData( &f_tags, "tags", "list of the subsets the objet belongs to")) + , f_tags(initData( &f_tags, "tags", "list of the subsets the object belongs to")) , f_bbox(initData( &f_bbox, "bbox", "this object bounding box")) , d_componentState(initData(&d_componentState, ComponentState::Undefined, "componentState", "The state of the component among (Dirty, Valid, Undefined, Loading, Invalid).")) { @@ -567,7 +567,7 @@ void Base::parse ( BaseObjectDescription* arg ) { const std::string& attrName = it.first; - // FIX: "type" is already used to define the type of object to instanciate, any Data with + // FIX: "type" is already used to define the type of object to instantiate, any Data with // the same name cannot be extracted from BaseObjectDescription if (attrName == std::string("type")) continue; diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h index 4e0fcafb84b..74948aa9674 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Base.h @@ -50,7 +50,7 @@ namespace sofa::core::objectmodel /** * \brief Base class for everything * - * This class contains all functionnality shared by every objects in SOFA. + * This class contains all functionality shared by every objects in SOFA. * Most importantly it defines how to retrieve information about an object (name, type, data fields). * All classes deriving from Base should use the SOFA_CLASS macro within their declaration (see BaseClass.h). * @@ -391,7 +391,7 @@ class SOFA_CORE_API Base Data f_printLog; ///< if true, emits extra messages at runtime. - Data< sofa::core::objectmodel::TagSet > f_tags; ///< list of the subsets the objet belongs to + Data< sofa::core::objectmodel::TagSet > f_tags; ///< list of the subsets the object belongs to Data< sofa::type::BoundingBox > f_bbox; ///< this object bounding box diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseContext.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseContext.h index aa45f6bdf46..6163cb1a95e 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseContext.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseContext.h @@ -39,7 +39,7 @@ namespace sofa::core::objectmodel * \brief Base class for Context classes, storing shared variables and parameters. * * A Context contains values or pointers to variables and parameters shared - * by a group of objects, typically refering to the same simulated body. + * by a group of objects, typically referring to the same simulated body. * Derived classes can defined simple isolated contexts or more powerful * hierarchical representations (scene-graphs), in which case the context also * implements the BaseNode interface. @@ -185,7 +185,7 @@ class SOFA_CORE_API BaseContext : public virtual Base return result ; } - /// Returns a list of object of type passed as a parameter. There shoud be no + /// Returns a list of object of type passed as a parameter. There should be no /// Copy constructor because of Return Value Optimization. /// eg: /// for(BaseObject* o : context->getObjects() ){ ... } diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.h index 410a699171f..79cbe8e255b 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.h @@ -139,7 +139,7 @@ class SOFA_CORE_API BaseNode : public virtual Base void clearObjectContext(BaseObject::SPtr obj); - /// @name virtual functions to add/remove special components direclty in the right Sequence + /// @name virtual functions to add/remove special components directly in the right Sequence /// Note it is useful for Node, but is not mandatory for every BaseNode Inheritances /// so the default implementation does nothing /// @{ diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.h index 027fa143819..8b149518b14 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.h @@ -31,7 +31,7 @@ namespace sofa::core::objectmodel /** * \brief Base class for simulation components. * - * An object defines a part of the functionnality in the simulation + * An object defines a part of the functionality in the simulation * (stores state data, specify topology, compute forces, etc). * Each simulation object is related to a context, which gives access to all available external data. * It is able to process events, if listening enabled (default is false). @@ -107,7 +107,7 @@ class SOFA_CORE_API BaseObject : public virtual Base virtual void reset(); /// Called just before deleting this object - /// Any object in the tree bellow this object that are to be removed will be removed only after this call, + /// Any object in the tree below this object that are to be removed will be removed only after this call, /// so any references this object holds should still be valid. virtual void cleanup(); diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObjectDescription.h b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObjectDescription.h index bcef0a1ab8b..997d6705c4d 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObjectDescription.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObjectDescription.h @@ -34,7 +34,7 @@ class Base; /** * \brief Base Interface for classes containing the description of an object, used to construct it. * - * This class defines what informations are used as input (read from a file for instance) to create an object. + * This class defines what information are used as input (read from a file for instance) to create an object. * This default implementation simply stores an attributes map and does not support any hierarchy. * */ diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Data.h b/Sofa/framework/Core/src/sofa/core/objectmodel/Data.h index 3bb0061ca42..d79e04eb4fb 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Data.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Data.h @@ -421,7 +421,7 @@ class WriteAccessor< core::objectmodel::Data > : public WriteAccessor /** @brief The WriteOnlyAccessor provides an access to the Data without triggering an engine update. - * This should be the prefered writeAccessor for most of the cases as it avoids uncessary Data updates. + * This should be the preferred writeAccessor for most of the cases as it avoids unnecessary Data updates. * @warning read access to the Data is NOT up-to-date */ template diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/JoystickEvent.h b/Sofa/framework/Core/src/sofa/core/objectmodel/JoystickEvent.h index 6be6d97207a..9d8baa2a2b0 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/JoystickEvent.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/JoystickEvent.h @@ -124,7 +124,7 @@ class SOFA_CORE_API JoystickEvent : public sofa::core::objectmodel::Event /** - * @brief Implements an event notifiying changes about a directionnal hat on a device (like a joystick). + * @brief Implements an event notifying changes about a directionnal hat on a device (like a joystick). */ class SOFA_CORE_API HatEvent { diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/Link.h b/Sofa/framework/Core/src/sofa/core/objectmodel/Link.h index 56d6a0d6f54..b1519d4bc89 100644 --- a/Sofa/framework/Core/src/sofa/core/objectmodel/Link.h +++ b/Sofa/framework/Core/src/sofa/core/objectmodel/Link.h @@ -108,7 +108,7 @@ template class LinkTraitsContainer; -/// Class to hold 0-or-1 pointer. The interface is similar to std::vector (size/[]/begin/end), plus an automatic convertion to one pointer. +/// Class to hold 0-or-1 pointer. The interface is similar to std::vector (size/[]/begin/end), plus an automatic conversion to one pointer. template < class T, class TDestPtr, class TPtr = T* > class SinglePtr { diff --git a/Sofa/framework/Core/src/sofa/core/topology/BaseTopology.h b/Sofa/framework/Core/src/sofa/core/topology/BaseTopology.h index 3eed21acf15..66aa9de56d4 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/BaseTopology.h +++ b/Sofa/framework/Core/src/sofa/core/topology/BaseTopology.h @@ -39,7 +39,7 @@ class GeometryAlgorithms; /// Provides low-level topology methods (e.g. AddPoint, RemoveEdge, etc). class TopologyModifier; -/// Contains the actual topology data and give acces to it. +/// Contains the actual topology data and give access to it. class TopologyContainer; /// Translates topology events (TopologyChange objects) from a topology so that they apply on another one. @@ -140,7 +140,7 @@ class SOFA_CORE_API TopologyModifier : public sofa::core::topology::BaseTopology */ void addStateChange(const TopologyChange *topologyChange); - /// Contains the actual topology data and give acces to it (nature of these data heavily depends on the kind of topology). + /// Contains the actual topology data and give access to it (nature of these data heavily depends on the kind of topology). TopologyContainer *m_topologyContainer; }; @@ -265,10 +265,10 @@ class SOFA_CORE_API TopologyContainer : public sofa::core::topology::BaseTopolog */ virtual bool unlinkTopologyHandlerToData(TopologyHandler* topologyHandler, sofa::geometry::ElementType elementType); - /// Array of topology modifications that have already occured (addition) or will occur next (deletion). + /// Array of topology modifications that have already occurred (addition) or will occur next (deletion). Data >m_changeList; - /// Array of state modifications that have already occured (addition) or will occur next (deletion). + /// Array of state modifications that have already occurred (addition) or will occur next (deletion). Data >m_stateChangeList; /// List of topology engines which will interact on all topological Data. diff --git a/Sofa/framework/Core/src/sofa/core/topology/TopologyChange.h b/Sofa/framework/Core/src/sofa/core/topology/TopologyChange.h index 8a7610253f3..ab4983c4c22 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/TopologyChange.h +++ b/Sofa/framework/Core/src/sofa/core/topology/TopologyChange.h @@ -140,7 +140,7 @@ struct TopologyElemID SOFA_CORE_API std::ostream& operator << (std::ostream& out, const TopologyElemID& d); SOFA_CORE_API std::istream& operator >> (std::istream& in, TopologyElemID& d); -/// Topology change informations related to the ancestor topology element of a point +/// Topology change information related to the ancestor topology element of a point struct PointAncestorElem { typedef type::Vec3 LocalCoords; @@ -161,7 +161,7 @@ struct PointAncestorElem SOFA_CORE_API std::ostream& operator << (std::ostream& out, const PointAncestorElem& d); SOFA_CORE_API std::istream& operator >> (std::istream& in, PointAncestorElem& d); -/// Topology change informations related to the ancestor topology element of an edge +/// Topology change information related to the ancestor topology element of an edge template struct ElemAncestorElem { diff --git a/Sofa/framework/Core/src/sofa/core/topology/TopologyData.h b/Sofa/framework/Core/src/sofa/core/topology/TopologyData.h index 25f5366c8d8..abc30b2072e 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/TopologyData.h +++ b/Sofa/framework/Core/src/sofa/core/topology/TopologyData.h @@ -110,8 +110,8 @@ class TopologyData : public sofa::core::topology::BaseTopologyData virtual void removeOnMovedPosition(const sofa::type::vector& indices); /** Method to add a callback when a element is deleted from this container. It will be called by @sa remove method for example. - * This is only to specify a specific behevior/computation when removing an element from this container. Otherwise normal deletion is applyed. - * Parameters are @param Index of the element which is detroyed and @value_type value hold by this container. + * This is only to specify a specific behevior/computation when removing an element from this container. Otherwise normal deletion is applied. + * Parameters are @param Index of the element which is destroyed and @value_type value hold by this container. */ void setDestructionCallback(std::function func) { p_onDestructionCallback = func; } diff --git a/Sofa/framework/Core/src/sofa/core/topology/TopologyData.inl b/Sofa/framework/Core/src/sofa/core/topology/TopologyData.inl index 589360058e4..b03ca751835 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/TopologyData.inl +++ b/Sofa/framework/Core/src/sofa/core/topology/TopologyData.inl @@ -97,7 +97,7 @@ void TopologyData ::linkToPointDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToPointDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToPointDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToPointDataArray as topology is not dynamic"; } /// Method used to link Data to edge Data array, using the TopologyHandler's method @@ -110,7 +110,7 @@ void TopologyData ::linkToEdgeDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToEdgeDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToEdgeDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToEdgeDataArray as topology is not dynamic"; } /// Method used to link Data to triangle Data array, using the TopologyHandler's method @@ -123,7 +123,7 @@ void TopologyData ::linkToTriangleDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToTriangleDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToTriangleDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToTriangleDataArray as topology is not dynamic"; } /// Method used to link Data to quad Data array, using the TopologyHandler's method @@ -136,7 +136,7 @@ void TopologyData ::linkToQuadDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToQuadDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToQuadDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToQuadDataArray as topology is not dynamic"; } /// Method used to link Data to tetrahedron Data array, using the TopologyHandler's method @@ -149,7 +149,7 @@ void TopologyData ::linkToTetrahedronDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToTetrahedronDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToTetrahedronDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToTetrahedronDataArray as topology is not dynamic"; } /// Method used to link Data to hexahedron Data array, using the TopologyHandler's method @@ -162,7 +162,7 @@ void TopologyData ::linkToHexahedronDataArray() msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " linkToHexahedronDataArray "; } else - msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToHexahedronDataArray as toplogy is not dynamic"; + msg_info(this->getOwner()) << "TopologyData: " << this->getName() << " won't be linkToHexahedronDataArray as topology is not dynamic"; } diff --git a/Sofa/framework/Core/src/sofa/core/topology/TopologySubsetData.h b/Sofa/framework/Core/src/sofa/core/topology/TopologySubsetData.h index b3a3c8610e1..ce83582ae76 100644 --- a/Sofa/framework/Core/src/sofa/core/topology/TopologySubsetData.h +++ b/Sofa/framework/Core/src/sofa/core/topology/TopologySubsetData.h @@ -128,8 +128,8 @@ class TopologySubsetData : public sofa::core::topology::TopologyData m_map2Elements; - /** Boolen to allow this TopologySubsetData to add new elements. If true, for every new Element added in the topology container + /** Boolean to allow this TopologySubsetData to add new elements. If true, for every new Element added in the topology container * linked by this TopologyData, the index of the new element will be added into this TopologySubsetData. */ bool m_addNewElements = false; diff --git a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h index 6355638eb70..fae0dde22a5 100644 --- a/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h +++ b/Sofa/framework/Core/src/sofa/core/visual/VisualModel.h @@ -92,7 +92,7 @@ class SOFA_CORE_API VisualModel : public virtual objectmodel::BaseObject public: /** - * \brief clear some graphical resources (generaly called before the deleteVisitor). + * \brief clear some graphical resources (generally called before the deleteVisitor). * \note: for more general usage you can use the cleanup visitor */ virtual void clearVisual() { } diff --git a/Sofa/framework/Core/test/Engine_test.cpp b/Sofa/framework/Core/test/Engine_test.cpp index 829e92fe4f6..938a70aa950 100644 --- a/Sofa/framework/Core/test/Engine_test.cpp +++ b/Sofa/framework/Core/test/Engine_test.cpp @@ -55,13 +55,13 @@ struct Engine_test : public BaseTest engine1->f_factor.setValue(2); engine1->init(); - // Engine 2 linked to the ouput of engine 1 + // Engine 2 linked to the output of engine 1 engine2 = sofa::core::objectmodel::New(); engine2->f_numberToMultiply.setParent(&engine1->f_result); engine2->f_factor.setValue(3); engine2->init(); - // Engine 3 linked to the ouput of engine 1 + // Engine 3 linked to the output of engine 1 engine3 = sofa::core::objectmodel::New(); engine3->f_numberToMultiply.setParent(&engine1->f_result); engine3->f_factor.setValue(3); @@ -128,7 +128,7 @@ struct Engine_test : public BaseTest } - // Test the propagation: if the ouput is changed the input must not changed + // Test the propagation: if the output is changed the input must not changed void testPropagationDirection() { // Check propagation direction diff --git a/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp b/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp index 06574d453c0..1306c64b794 100644 --- a/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp +++ b/Sofa/framework/Core/test/ObjectFactoryJson_test.cpp @@ -44,7 +44,7 @@ TEST(ObjectFactoryJson, oneObject) .add< simulation::DefaultAnimationLoop >().commitTo(&o), 1); const auto dump = core::ObjectFactoryJson::dump(&o); - const std::string expectedDump = R"x([{"className":"DefaultAnimationLoop","creator":{"":{"class":{"categories":["AnimationLoop"],"className":"DefaultAnimationLoop","namespaceName":"sofa::simulation","parents":["BaseAnimationLoop"],"shortName":"defaultAnimationLoop","templateName":"","typeName":"DefaultAnimationLoop"},"object":{"data":[{"defaultValue":"unnamed","group":"","help":"object name","name":"name","type":"string"},{"defaultValue":"0","group":"","help":"if true, emits extra messages at runtime.","name":"printLog","type":"bool"},{"defaultValue":"","group":"","help":"list of the subsets the objet belongs to","name":"tags","type":"TagSet"},{"defaultValue":"","group":"","help":"this object bounding box","name":"bbox","type":"BoundingBox"},{"defaultValue":"Undefined","group":"","help":"The state of the component among (Dirty, Valid, Undefined, Loading, Invalid).","name":"componentState","type":"ComponentState"},{"defaultValue":"0","group":"","help":"if true, handle the events, otherwise ignore the events","name":"listening","type":"bool"},{"defaultValue":"1","group":"","help":"If true, compute the global bounding box of the scene at each time step. Used mostly for rendering.","name":"computeBoundingBox","type":"bool"},{"defaultValue":"0","group":"","help":"If true, solves all the ODEs in parallel","name":"parallelODESolving","type":"bool"}],"link":[{"destinationTypeName":"BaseContext","help":"Graph Node containing this object (or BaseContext::getDefault() if no graph is used)","name":"context"},{"destinationTypeName":"BaseObject","help":"Sub-objects used internally by this object","name":"slaves"},{"destinationTypeName":"BaseObject","help":"nullptr for regular objects, or master object for which this object is one sub-objects","name":"master"},{"destinationTypeName":"BaseNode","help":"Link to the scene's node that will be processed by the loop","name":"targetNode"}]},"target":""}},"description":"foo\n"}])x"; + const std::string expectedDump = R"x([{"className":"DefaultAnimationLoop","creator":{"":{"class":{"categories":["AnimationLoop"],"className":"DefaultAnimationLoop","namespaceName":"sofa::simulation","parents":["BaseAnimationLoop"],"shortName":"defaultAnimationLoop","templateName":"","typeName":"DefaultAnimationLoop"},"object":{"data":[{"defaultValue":"unnamed","group":"","help":"object name","name":"name","type":"string"},{"defaultValue":"0","group":"","help":"if true, emits extra messages at runtime.","name":"printLog","type":"bool"},{"defaultValue":"","group":"","help":"list of the subsets the object belongs to","name":"tags","type":"TagSet"},{"defaultValue":"","group":"","help":"this object bounding box","name":"bbox","type":"BoundingBox"},{"defaultValue":"Undefined","group":"","help":"The state of the component among (Dirty, Valid, Undefined, Loading, Invalid).","name":"componentState","type":"ComponentState"},{"defaultValue":"0","group":"","help":"if true, handle the events, otherwise ignore the events","name":"listening","type":"bool"},{"defaultValue":"1","group":"","help":"If true, compute the global bounding box of the scene at each time step. Used mostly for rendering.","name":"computeBoundingBox","type":"bool"},{"defaultValue":"0","group":"","help":"If true, solves all the ODEs in parallel","name":"parallelODESolving","type":"bool"}],"link":[{"destinationTypeName":"BaseContext","help":"Graph Node containing this object (or BaseContext::getDefault() if no graph is used)","name":"context"},{"destinationTypeName":"BaseObject","help":"Sub-objects used internally by this object","name":"slaves"},{"destinationTypeName":"BaseObject","help":"nullptr for regular objects, or master object for which this object is one sub-objects","name":"master"},{"destinationTypeName":"BaseNode","help":"Link to the scene's node that will be processed by the loop","name":"targetNode"}]},"target":""}},"description":"foo\n"}])x"; EXPECT_EQ(dump, expectedDump); } @@ -64,7 +64,7 @@ TEST(ObjectFactoryJson, oneTemplatedObject) const auto dump = core::ObjectFactoryJson::dump(&o); const auto vec3name = core::objectmodel::BaseClassNameHelper::getTypeName(); - const std::string expectedDump = R"x([{"className":"DummyComponent","creator":{"Vec3f":{"class":{"categories":["_Miscellaneous"],"className":"DummyComponent","namespaceName":"sofa","parents":["BaseObject"],"shortName":"dummyComponent","templateName":"Vec3f","typeName":"DummyComponent<)x" + std::string{vec3name} + R"x(>"},"object":{"data":[{"defaultValue":"unnamed","group":"","help":"object name","name":"name","type":"string"},{"defaultValue":"0","group":"","help":"if true, emits extra messages at runtime.","name":"printLog","type":"bool"},{"defaultValue":"","group":"","help":"list of the subsets the objet belongs to","name":"tags","type":"TagSet"},{"defaultValue":"","group":"","help":"this object bounding box","name":"bbox","type":"BoundingBox"},{"defaultValue":"Undefined","group":"","help":"The state of the component among (Dirty, Valid, Undefined, Loading, Invalid).","name":"componentState","type":"ComponentState"},{"defaultValue":"0","group":"","help":"if true, handle the events, otherwise ignore the events","name":"listening","type":"bool"}],"link":[{"destinationTypeName":"BaseContext","help":"Graph Node containing this object (or BaseContext::getDefault() if no graph is used)","name":"context"},{"destinationTypeName":"BaseObject","help":"Sub-objects used internally by this object","name":"slaves"},{"destinationTypeName":"BaseObject","help":"nullptr for regular objects, or master object for which this object is one sub-objects","name":"master"}]},"target":""}},"description":"foo\n"}])x"; + const std::string expectedDump = R"x([{"className":"DummyComponent","creator":{"Vec3f":{"class":{"categories":["_Miscellaneous"],"className":"DummyComponent","namespaceName":"sofa","parents":["BaseObject"],"shortName":"dummyComponent","templateName":"Vec3f","typeName":"DummyComponent<)x" + std::string{vec3name} + R"x(>"},"object":{"data":[{"defaultValue":"unnamed","group":"","help":"object name","name":"name","type":"string"},{"defaultValue":"0","group":"","help":"if true, emits extra messages at runtime.","name":"printLog","type":"bool"},{"defaultValue":"","group":"","help":"list of the subsets the object belongs to","name":"tags","type":"TagSet"},{"defaultValue":"","group":"","help":"this object bounding box","name":"bbox","type":"BoundingBox"},{"defaultValue":"Undefined","group":"","help":"The state of the component among (Dirty, Valid, Undefined, Loading, Invalid).","name":"componentState","type":"ComponentState"},{"defaultValue":"0","group":"","help":"if true, handle the events, otherwise ignore the events","name":"listening","type":"bool"}],"link":[{"destinationTypeName":"BaseContext","help":"Graph Node containing this object (or BaseContext::getDefault() if no graph is used)","name":"context"},{"destinationTypeName":"BaseObject","help":"Sub-objects used internally by this object","name":"slaves"},{"destinationTypeName":"BaseObject","help":"nullptr for regular objects, or master object for which this object is one sub-objects","name":"master"}]},"target":""}},"description":"foo\n"}])x"; EXPECT_EQ(dump, expectedDump); } diff --git a/Sofa/framework/Core/test/TestEngine.cpp b/Sofa/framework/Core/test/TestEngine.cpp index 471c59c7409..74d728dabdd 100644 --- a/Sofa/framework/Core/test/TestEngine.cpp +++ b/Sofa/framework/Core/test/TestEngine.cpp @@ -78,7 +78,7 @@ void TestEngine::doUpdate() const SReal factor = f_factor.getValue(); -///// THEN tell everthing is (will be) up to date now +///// THEN tell everything is (will be) up to date now /// @warning This must be done AFTER updating all inputs /// can be done before or after setting up the outputs cleanDirty(); diff --git a/Sofa/framework/Core/test/TrackedData_test.cpp b/Sofa/framework/Core/test/TrackedData_test.cpp index c1959353aaf..39780a56921 100644 --- a/Sofa/framework/Core/test/TrackedData_test.cpp +++ b/Sofa/framework/Core/test/TrackedData_test.cpp @@ -372,7 +372,7 @@ struct DataTrackerFunctor_test: public BaseTest // modifying the Data even with the same value is calling the functor // note it would be possible to do your own functor, // that keep a hash of the previous value - // if you really need to check when the data trully changed + // if you really need to check when the data truly changed testObject.myData.setValue( false ); ASSERT_EQ( 3u, myDataFunctor.m_counter ); diff --git a/Sofa/framework/Core/test/objectmodel/BaseClass_test.cpp b/Sofa/framework/Core/test/objectmodel/BaseClass_test.cpp index e7794f78db1..9da2f01d6d8 100644 --- a/Sofa/framework/Core/test/objectmodel/BaseClass_test.cpp +++ b/Sofa/framework/Core/test/objectmodel/BaseClass_test.cpp @@ -163,7 +163,7 @@ class BaseClass_test: public BaseTest }; /// -/// tests that all the BaseClass returned from GetClass function are refering to the same +/// tests that all the BaseClass returned from GetClass function are referring to the same /// BaseClass instance. /// TEST_F(BaseClass_test, checkClassEquivalence ) diff --git a/Sofa/framework/Core/test/objectmodel/BaseObjectDescription_test.cpp b/Sofa/framework/Core/test/objectmodel/BaseObjectDescription_test.cpp index 6ac1000799f..702eb1f077a 100644 --- a/Sofa/framework/Core/test/objectmodel/BaseObjectDescription_test.cpp +++ b/Sofa/framework/Core/test/objectmodel/BaseObjectDescription_test.cpp @@ -115,7 +115,7 @@ struct BaseObjectDescription_test: public BaseTest EXPECT_EQ( objectDescription.getAttributeAsFloat("aFirstNonFloatAttribute", -1234.0), -1234.0) ; EXPECT_EQ( objectDescription.getAttributeAsFloat("aSecondNonFloatAttribute", -1234.0), -1234.0) ; EXPECT_EQ( objectDescription.getErrors().size(), (size_t)3) << "If this fails this means that one of the three previous " - "conversion succeded while it shouldn't"; + "conversion succeeded while it shouldn't"; EXPECT_EQ( objectDescription.getAttributeAsFloat("aFloatAttribute", -1234.0), 1.0) ; EXPECT_EQ( objectDescription.getErrors().size(), (size_t)3) ; @@ -147,7 +147,7 @@ struct BaseObjectDescription_test: public BaseTest EXPECT_EQ( objectDescription.getAttributeAsInt("aFirstNonIntAttribute", -1234.0), -1234.0) ; EXPECT_EQ( objectDescription.getAttributeAsInt("aSecondNonIntAttribute", -1234.0), -1234.0) ; EXPECT_EQ( objectDescription.getErrors().size(), (size_t)2) << "If this fails this means that one of the three previous " - "conversion succeded while it shouldn't"; + "conversion succeeded while it shouldn't"; } }; diff --git a/Sofa/framework/Core/test/objectmodel/DataLink_test.cpp b/Sofa/framework/Core/test/objectmodel/DataLink_test.cpp index 393b353a7c1..5224554b18f 100644 --- a/Sofa/framework/Core/test/objectmodel/DataLink_test.cpp +++ b/Sofa/framework/Core/test/objectmodel/DataLink_test.cpp @@ -30,7 +30,7 @@ using sofa::type::Vec3d; using sofa::type::Vec3f; /** Test suite for data link. -Create two datas and a link between them. +Create two data and a link between them. Set the value of data1 and check if the boolean is dirty of data2 is true and that the value of data2 is right. */ struct DataLink_test: public BaseTest @@ -43,7 +43,7 @@ struct DataLink_test: public BaseTest /// This method is defined in gtest framework to setting the test up. void SetUp() override { - /// Setup the data and create a link between the two datas + /// Setup the data and create a link between the two data data1.setName("data1"); data2.setName("data2"); diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/AbstractTypeInfo.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/AbstractTypeInfo.h index 520f3c32add..d9223af1fa4 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/AbstractTypeInfo.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/AbstractTypeInfo.h @@ -36,9 +36,9 @@ namespace sofa::defaulttype should be allocated to copy it?), and allows manipulating Data generically, without knowing their exact type. - This class is primarily used to copy information accross BaseData objects, + This class is primarily used to copy information across BaseData objects, for example when there exists a link between two instances of BaseData. - E.g. this mecanism allows you to copy the content of a Data> + E.g. this mechanism allows you to copy the content of a Data> into a Data>, because there is an acceptable conversion between integer and double, and because both Data use a resizable container. diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/SolidTypes.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/SolidTypes.h index 72b92178766..564ef359be2 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/SolidTypes.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/SolidTypes.h @@ -63,7 +63,7 @@ class SOFA_DEFAULTTYPE_API SolidTypes /** * \brief A twist aka a SpatialVector representing a velocity - * This is pratically a SpatialVector (screw) with the additionnal semantics + * This is practically a SpatialVector (screw) with the additional semantics * that this screw represents a twist (velocity) and not a wrench (force and torque) * @author Anthony Truchet, CEA, 2006 */ @@ -76,7 +76,7 @@ class SOFA_DEFAULTTYPE_API SolidTypes /** * \brief A wrench aka a SpatialVector representing a force and a torque - * This is pratically a SpatialVector (screw) with the additionnal semantics + * This is practically a SpatialVector (screw) with the additional semantics * that this screw represents a wrench (force and torque) and not a twist (velocity) * @author Anthony Truchet, CEA, 2006 */ diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistry.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistry.h index 15d97427b76..a983d56003f 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistry.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistry.h @@ -36,14 +36,14 @@ class AbstractTypeInfo; * @brief An unique singleton to register all the type info defined in Sofa * * AbstractTypeInfo offers an API to manipulate the data content of a specific type - * without requiering the inner details of the type. Have a look in AbstractTypeInfo - * for more informations. + * without requiring the inner details of the type. Have a look in AbstractTypeInfo + * for more information. * - * On its side, TypeInfoRegistry holds all the instances of object thats inherits + * On its side, TypeInfoRegistry holds all the instances of object that inherits * from AbstractTypeInfo * * The common use case is get the type id to access a full AbstractTypeInfo from - * the TypeInfoRegistry. The acces is done with a TypeInfoId instance that stores + * the TypeInfoRegistry. The access is done with a TypeInfoId instance that stores * an unique identifier for each data type. * * Example of use: @@ -62,7 +62,7 @@ class SOFA_DEFAULTTYPE_API TypeInfoRegistry /// provides the compilationTarget where the typeinfo is declared to ease the tracking of DataTypes. static int Set(const TypeInfoId& tid, AbstractTypeInfo* info, const std::string& compilationTarget); - /// Returns a vecotr with all the AbstractTypeInfo that have been registered in the specified target. + /// Returns a vector with all the AbstractTypeInfo that have been registered in the specified target. /// An empty target select everything that is in the registry. static std::vector GetRegisteredTypes(const std::string& target=""); diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistryTools.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistryTools.h index b2bff05281e..898cb676d56 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistryTools.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/TypeInfoRegistryTools.h @@ -31,14 +31,14 @@ namespace sofa::defaulttype * @brief Encodes the different kind of type infos stored in the TypeInfoRegistry * * In the TyepeInfoRegistry we can store different type of type info depending - * on how much the developper want to provide precise information (or not) + * on how much the developer want to provide precise information (or not) * on its data type. * * MISSING indicates that there was absolutely no valid information to trust in * an AbstractTypeInfo object. * * NAMEONLY indicates that only the getName() and getTypeName() function are returning - * valid informations. + * valid information. * * COMPLETE indicates that all the function like size/getSize/etc... are implemented. * diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/VecTypes.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/VecTypes.h index 1a4c0907cd4..7fbb70e7c44 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/VecTypes.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/VecTypes.h @@ -63,7 +63,7 @@ class StdVectorTypes protected: - /// @internal size dependant specializations + /// @internal size dependent specializations /// @{ template diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/SetTypeInfo.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/SetTypeInfo.h index 87e9cbe0fb6..a6ecd0933d8 100644 --- a/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/SetTypeInfo.h +++ b/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/SetTypeInfo.h @@ -73,7 +73,7 @@ struct SetTypeInfo static bool setSize(DataType& data, sofa::Size /*size*/) { - data.clear(); // we can't "resize" a set, so the only meaningfull operation is to clear it, as values will be added dynamically in setValue + data.clear(); // we can't "resize" a set, so the only meaningful operation is to clear it, as values will be added dynamically in setValue return true; } diff --git a/Sofa/framework/DefaultType/test/QuaternionIntegration_test.cpp b/Sofa/framework/DefaultType/test/QuaternionIntegration_test.cpp index 0f686bf059b..91859add5bd 100644 --- a/Sofa/framework/DefaultType/test/QuaternionIntegration_test.cpp +++ b/Sofa/framework/DefaultType/test/QuaternionIntegration_test.cpp @@ -65,11 +65,11 @@ struct QuaternionIntegrationTest : NumericTest< typename Rigid3Types::Real > { }; -// Define the list of types to instanciate. We do not necessarily need to test all combinations. +// Define the list of types to instantiate. We do not necessarily need to test all combinations. using ::testing::Types; -typedef Types DataTypes; // the types to instanciate. +typedef Types DataTypes; // the types to instantiate. -// Test suite for all the instanciations +// Test suite for all the instantiations TYPED_TEST_SUITE(QuaternionIntegrationTest, DataTypes); // first test case diff --git a/Sofa/framework/DefaultType/test/RigidDeriv_test.cpp b/Sofa/framework/DefaultType/test/RigidDeriv_test.cpp index bdc6fad05fc..cf1d58e88cd 100644 --- a/Sofa/framework/DefaultType/test/RigidDeriv_test.cpp +++ b/Sofa/framework/DefaultType/test/RigidDeriv_test.cpp @@ -27,8 +27,8 @@ template void testName(const std::string& expectedName) { using Deriv = sofa::defaulttype::RigidDeriv; - using Bloc = sofa::linearalgebra::matrix_bloc_traits; - EXPECT_EQ(std::string(Bloc::Name()), expectedName); + using Block = sofa::linearalgebra::matrix_bloc_traits; + EXPECT_EQ(std::string(Block::Name()), expectedName); } TEST(RigidDerivTest, Name) diff --git a/Sofa/framework/Geometry/src/sofa/geometry/Edge.h b/Sofa/framework/Geometry/src/sofa/geometry/Edge.h index a4d4072c8fc..d1266ddc6b0 100644 --- a/Sofa/framework/Geometry/src/sofa/geometry/Edge.h +++ b/Sofa/framework/Geometry/src/sofa/geometry/Edge.h @@ -274,7 +274,7 @@ struct Edge // [ (pA - pC) + alpha(pB - pA) - beta(pD - pC) ].dot(pD - pC) = 0 const auto CA = pA - pC; - // Writting d[CA/AB] == (pA - pC).dot(pB - pA) and subtituting beta we obtain: + // Writing d[CA/AB] == (pA - pC).dot(pB - pA) and substituting beta we obtain: // beta = (d[CA/CD] + alpha * d[AB/CD]) / d[CD/CD] // alpha = ( d[CA/CD]*d[CD/AB] - d[CA/AB]*d[CD/CD] ) / ( d[AB/AB]*d[CD/CD] - d[AB/CD]*d[AB/CD]) const T dCACD = sofa::type::dot(CA, CD); diff --git a/Sofa/framework/Helper/simutest/CMakeLists.txt b/Sofa/framework/Helper/simutest/CMakeLists.txt index bb0fc276be7..4b22559aca8 100644 --- a/Sofa/framework/Helper/simutest/CMakeLists.txt +++ b/Sofa/framework/Helper/simutest/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22) project(Sofa.Helper_simutest) -# Do not find dependencies explicitely, let CMake decide the appropriate time to do it +# Do not find dependencies explicitly, let CMake decide the appropriate time to do it #sofa_find_package(SofaBase REQUIRED) set(SOURCE_FILES diff --git a/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.h b/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.h index 2efb9bb8aca..5e029e26347 100644 --- a/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.h +++ b/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.h @@ -78,7 +78,7 @@ namespace sofa::helper * When a noteworthy value must be accumulated: AdvancedTimer::valAdd("dofs",mstate->getSize()); - * When reloading/reseting the simulation: + * When reloading/resetting the simulation: AdvancedTimer::clear(); @@ -365,7 +365,7 @@ class SOFA_HELPER_API AdvancedTimer /** - * @brief end Ovveride fo the end method in which you can use JSON or old format + * @brief end Override fo the end method in which you can use JSON or old format * @param id IdTimer, the id of the used timer * @param time double, current time (from the context) * @param time dt, current delta time or dt (from the context) diff --git a/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp b/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp index bf0fb6d569f..63d34978079 100644 --- a/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/ComponentChange.cpp @@ -599,9 +599,9 @@ const std::map > movedComponents = { { "OBBModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, { "RigidCapsuleCollisionModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, { "CapsuleCollisionModel", Moved("v22.06", "SofaMiscCollision", "CollisionOBBCapsule") }, - { "TriangleModelInRegularGrid", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collsion.Geometry") }, - { "TetrahedronCollisionModel", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collsion.Geometry") }, - { "RuleBasedContactManager", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collsion.Response.Contact") }, + { "TriangleModelInRegularGrid", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Geometry") }, + { "TetrahedronCollisionModel", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Geometry") }, + { "RuleBasedContactManager", Moved("v22.06", "SofaMiscCollision", "Sofa.Component.Collision.Response.Contact") }, // SofaHaptics was deprecated in #3039 { "ForceFeedback", Moved("v22.06", "SofaHaptics", "Sofa.Component.Haptics") }, diff --git a/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp b/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp index c2a3e328920..86c121f455b 100644 --- a/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp @@ -29,7 +29,7 @@ namespace sofa::helper std::vector> SOFA_HELPER_API getClosestMatch(const std::string& needle, const std::vector& haystack, - const Size numEntries, const SReal thresold) + const Size numEntries, const SReal threshold) { class Tuple { @@ -53,7 +53,7 @@ std::vector> SOFA_HELPER_API getClosestMatch(cons std::vector> result; while(!q3.empty() && result.size()<=numEntries) { - if(q3.top().ratio < thresold) + if(q3.top().ratio < threshold) break; result.push_back(std::make_tuple(q3.top().value, q3.top().ratio)); q3.pop(); diff --git a/Sofa/framework/Helper/src/sofa/helper/DiffLib.h b/Sofa/framework/Helper/src/sofa/helper/DiffLib.h index b4687de6076..db8b2540594 100644 --- a/Sofa/framework/Helper/src/sofa/helper/DiffLib.h +++ b/Sofa/framework/Helper/src/sofa/helper/DiffLib.h @@ -30,7 +30,7 @@ namespace sofa::helper /// Search for the the closest match to the string passed in the "needle" argument within the vector of "haystack" arguments. std::vector> SOFA_HELPER_API getClosestMatch(const std::string& needle, const std::vector& haystack, - const Size numEntries=5, const SReal thresold=0.5_sreal); + const Size numEntries=5, const SReal threshold=0.5_sreal); } diff --git a/Sofa/framework/Helper/src/sofa/helper/FnDispatcher.h b/Sofa/framework/Helper/src/sofa/helper/FnDispatcher.h index 92dc1ab9655..ce6021648e0 100644 --- a/Sofa/framework/Helper/src/sofa/helper/FnDispatcher.h +++ b/Sofa/framework/Helper/src/sofa/helper/FnDispatcher.h @@ -47,11 +47,11 @@ class BasicDispatcher void add(const std::type_info& class1, const std::type_info& class2, F fun) ; void ignore(const std::type_info& class1, const std::type_info& class2) ; - template + template void ignore() { this->BasicDispatcher::add(typeid(ConcreteClass1), typeid(ConcreteClass2), &ignoreFn); - if (symetric) + if (symmetric) { this->BasicDispatcher::add(typeid(ConcreteClass2), typeid(ConcreteClass1), &ignoreFn); } @@ -69,7 +69,7 @@ class FnDispatcher : public BasicDispatcher { public: - template + template void add() { struct Local @@ -85,17 +85,17 @@ class FnDispatcher : public BasicDispatcher } }; this->BasicDispatcher::add(typeid(ConcreteClass1), typeid(ConcreteClass2), &Local::trampoline); - if (symetric) + if (symmetric) { this->BasicDispatcher::add(typeid(ConcreteClass2), typeid(ConcreteClass1), &Local::trampolineR); } } - template + template void ignore() { this->BasicDispatcher::ignore(typeid(ConcreteClass1), typeid(ConcreteClass2)); - if (symetric) + if (symmetric) { this->BasicDispatcher::ignore(typeid(ConcreteClass2), typeid(ConcreteClass1)); } diff --git a/Sofa/framework/Helper/src/sofa/helper/GenerateRigid.h b/Sofa/framework/Helper/src/sofa/helper/GenerateRigid.h index 496acc7797e..704f260c6d0 100644 --- a/Sofa/framework/Helper/src/sofa/helper/GenerateRigid.h +++ b/Sofa/framework/Helper/src/sofa/helper/GenerateRigid.h @@ -248,7 +248,7 @@ void generateRigid( GenerateRigidInfo& res res.mass = rigidMass.mass; res.inertia = res.mass * rigidMass.inertiaMatrix; - // a threshol to test if inertia is diagonal in function of diagonal values + // a threshold to test if inertia is diagonal in function of diagonal values const SReal threshold = type::trace( res.inertia ) * 1e-6; // if not diagonal, extracting principal axes basis to get the corresponding rotation with a diagonal inertia diff --git a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.cpp b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.cpp index bf968c094c9..8afd82b8672 100644 --- a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.cpp @@ -766,7 +766,7 @@ namespace sofa::helper // A priori, il n'y a pas de données sur les bords (tout du moins sur le premier voxel) void MarchingCubeUtility::findSeeds ( vector& seeds, const float isoValue, unsigned char *_data ) { - msg_info() << "findSeeds(). Begining." ; + msg_info() << "findSeeds(). Beginning." ; std::set parsedVoxels; const size_t datasize = dataResolution[0]*dataResolution[1]*dataResolution[2]; diff --git a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h index 4604652fd96..12d20351216 100644 --- a/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h +++ b/Sofa/framework/Helper/src/sofa/helper/MarchingCubeUtility.h @@ -69,7 +69,7 @@ class SOFA_HELPER_API MarchingCubeUtility this->convolutionSize = convolutionSize; } - /// Set the bounding box from real coords to apply mCube localy. + /// Set the bounding box from real coords to apply mCube locally. void setBoundingBoxFromRealCoords ( const type::Vec3& min, const type::Vec3& max ) { type::Vec3 gridSize = dataVoxelSize * cubeStep; @@ -82,7 +82,7 @@ class SOFA_HELPER_API MarchingCubeUtility {static_cast(max.x()), static_cast(max.y()), static_cast(max.z())}); } - /// Set the bounding box (in the data space) to apply mCube localy. + /// Set the bounding box (in the data space) to apply mCube locally. void setROI ( const type::Vec3i& min, const type::Vec3i& max ) { this->roi.min = min; @@ -95,7 +95,7 @@ class SOFA_HELPER_API MarchingCubeUtility if ( roi.max[2] > dataResolution[2] )roi.max[2] = dataResolution[2]; } - /// Set the bounding box (in the data space) to apply mCube localy. + /// Set the bounding box (in the data space) to apply mCube locally. void setBoundingBox ( const type::Vec6i& roi ) { const type::Vec3i _min( roi[0], roi[1], roi[2]); @@ -103,7 +103,7 @@ class SOFA_HELPER_API MarchingCubeUtility setBoundingBox( _min, _max); } - /// Set the bounding box (in the data space) to apply mCube localy. + /// Set the bounding box (in the data space) to apply mCube locally. void setBoundingBox ( const type::Vec3i& min, const type::Vec3i& max ) { this->bbox.min = min; @@ -119,7 +119,7 @@ class SOFA_HELPER_API MarchingCubeUtility /// given a set of data (size of the data and size of the marching cube beeing defined previously), /// we construct the surface. /// mesh is a vector containing the triangles defined as a sequence of three indices - /// map_indices gives the correspondance between an indice and a 3d position in space + /// map_indices gives the correspondence between an indice and a 3d position in space void run ( unsigned char *data, const float isolevel, sofa::type::vector< PointID > &triangles, sofa::type::vector< type::Vec3> &vertices, diff --git a/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h index 03ae3943dea..a6fa39ac04b 100644 --- a/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h +++ b/Sofa/framework/Helper/src/sofa/helper/OptionsGroup.h @@ -37,7 +37,7 @@ namespace sofa::helper /////////////////////////////////////////////////////////////////////////////////// /** * \brief OptionsGroup is a kind of data for a radio button. It has a list of text - * representing a list of choices, and a interger number indicating the choice + * representing a list of choices, and a integer number indicating the choice * selected. * */ @@ -93,13 +93,13 @@ public : ///Setting the activated item by a input-stream. ///the istream is converted to string. - ///If the reading string is in options list, its value is setted activated, + ///If the reading string is in options list, its value is set activated, ///else push a warning. void readFromStream(std::istream& stream); /// @} - /// @name getting informations operators + /// @name getting information operators /// @{ [[nodiscard]] unsigned int getSelectedId() const; [[nodiscard]] const std::string& getSelectedItem() const; diff --git a/Sofa/framework/Helper/src/sofa/helper/Polynomial_LD.h b/Sofa/framework/Helper/src/sofa/helper/Polynomial_LD.h index 0041dd5c143..d6669781dd5 100644 --- a/Sofa/framework/Helper/src/sofa/helper/Polynomial_LD.h +++ b/Sofa/framework/Helper/src/sofa/helper/Polynomial_LD.h @@ -45,7 +45,7 @@ namespace sofa::helper * * Todo this first version of polynomial is a linear presentation. * This presentation is efficient for arithmetic operator like +,-,\*,/ and derivative. - * But is not optimized for the evaluating (comparing to the recurent presentation). + * But is not optimized for the evaluating (comparing to the recurrent presentation). */ template class Monomial_LD @@ -103,7 +103,7 @@ public : ///Evaluating partial derivative hight order by idvar-th variable in ideriv-th order // Real operator()(const RNpoint & x,unsigned int idvar,unsigned int ideriv) const;//Todo - ///Derivative operator alowing to write p1=p2.d(x); + ///Derivative operator allowing to write p1=p2.d(x); Monomial_LD d(const unsigned int & ideriv) const; void writeToStream(std::ostream & ff) const; @@ -184,7 +184,7 @@ public : ///Evaluating partial derivative hight order by idvar-th variable in ideriv-th order // Real operator()(const RNpoint & x,unsigned int idvar,unsigned int ideriv) const;//Todo - ///Derivative operator alowing to write p1=p2.d(x); + ///Derivative operator allowing to write p1=p2.d(x); Polynomial_LD d(const unsigned int & ideriv) const; void setnbOfMonomial(int m_nbofmonomial); diff --git a/Sofa/framework/Helper/src/sofa/helper/StringUtils.cpp b/Sofa/framework/Helper/src/sofa/helper/StringUtils.cpp index 72a14d8e1e9..1314c1580bf 100644 --- a/Sofa/framework/Helper/src/sofa/helper/StringUtils.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/StringUtils.cpp @@ -31,7 +31,7 @@ namespace sofa::helper std::wstring widenString(const std::string& s) { - // Set LC_CTYPE according to the environnement variable, for mbsrtowcs(). + // Set LC_CTYPE according to the environment variable, for mbsrtowcs(). system::TemporaryLocale locale(LC_CTYPE, ""); const char * src = s.c_str(); @@ -66,7 +66,7 @@ std::wstring widenString(const std::string& s) std::string narrowString(const std::wstring& ws) { - // Set LC_CTYPE according to the environnement variable, for wcstombs(). + // Set LC_CTYPE according to the environment variable, for wcstombs(). system::TemporaryLocale locale(LC_CTYPE, ""); const wchar_t * src = ws.c_str(); diff --git a/Sofa/framework/Helper/src/sofa/helper/StringUtils.h b/Sofa/framework/Helper/src/sofa/helper/StringUtils.h index 10901667e6a..8ee732f6bb5 100644 --- a/Sofa/framework/Helper/src/sofa/helper/StringUtils.h +++ b/Sofa/framework/Helper/src/sofa/helper/StringUtils.h @@ -89,7 +89,7 @@ std::string join(const Container& elems, const S& delim) ///@brief returns a copy of the string given in argument. SOFA_HELPER_API char* getAStringCopy(const char *c); -///@brief replace all occurence of "search" by the "replace" string. +///@brief replace all occurrence of "search" by the "replace" string. SOFA_HELPER_API void replaceAll(std::string& str, const std::string& search, const std::string& replace); diff --git a/Sofa/framework/Helper/src/sofa/helper/decompose.h b/Sofa/framework/Helper/src/sofa/helper/decompose.h index bee4d82d80f..8f20fb7225a 100644 --- a/Sofa/framework/Helper/src/sofa/helper/decompose.h +++ b/Sofa/framework/Helper/src/sofa/helper/decompose.h @@ -119,7 +119,7 @@ class Decompose */ static Real polarDecomposition( const type::Mat<3,3,Real>& M, type::Mat<3,3,Real>& Q ); - /** Polar decomposition of a 2x2 matix M = QS + /** Polar decomposition of a 2x2 matrix M = QS * Analytic formulation given in * "Matrix Animation and Polar Decomposition" * Ken Shoemake, Computer Graphics Laboratory, University of Pennsylvania @@ -215,7 +215,7 @@ class Decompose */ static void SVD( const type::Mat<3,3,Real> &F, type::Mat<3,3,Real> &U, type::Vec<3,Real> &S, type::Mat<3,3,Real> &V ); - /** SVD based on the Eigensystem decomposition of FtF with robustness against invertion and degenerate configurations + /** SVD based on the Eigensystem decomposition of FtF with robustness against inversion and degenerate configurations * \returns true iff the stabilization processed an inverted rotation or a degenerate case * U & V are rotations * Warning eigenvalues are not guaranteed to be positive, eigenvalues are not sorted @@ -229,7 +229,7 @@ class Decompose */ static void SVD( const type::Mat<3,2,Real> &F, type::Mat<3,2,Real> &U, type::Vec<2,Real> &S, type::Mat<2,2,Real> &V ); - /** SVD based on the Eigensystem decomposition of FtF with robustness against invertion and degenerate configurations + /** SVD based on the Eigensystem decomposition of FtF with robustness against inversion and degenerate configurations * \returns true in a degenerate case * U & V are rotations * Warning eigenvalues are not guaranteed to be positive, eigenvalues are not sorted @@ -367,7 +367,7 @@ class Decompose /** @internal useful for iterative eigenDecomposition * QL algorithm with implicit shifting, applies to tridiagonal matrices - * Derived from numerical recipies + * Derived from numerical recipes */ template static void QLAlgorithm( type::Vec &diag, type::Vec &subDiag, type::Mat &V ); diff --git a/Sofa/framework/Helper/src/sofa/helper/decompose.inl b/Sofa/framework/Helper/src/sofa/helper/decompose.inl index c373be6208d..4e3994db2dc 100644 --- a/Sofa/framework/Helper/src/sofa/helper/decompose.inl +++ b/Sofa/framework/Helper/src/sofa/helper/decompose.inl @@ -401,7 +401,7 @@ bool Decompose::QRDecomposition_stable( const type::Mat<2,2,Real> &M, type n = edge.norm2(); if( n < zeroTolerance() ) { - // colapsed to a point + // collapsed to a point r[0][0] = 1; r[1][0] = 0; r[0][1] = 0; r[1][1] = 1; @@ -409,7 +409,7 @@ bool Decompose::QRDecomposition_stable( const type::Mat<2,2,Real> &M, type } else { - // edgex collapsed but edgey not colapsed + // edgex collapsed but edgey not collapsed edge /= helper::rsqrt(n); r[0][0] = edge[1]; r[1][0] = -edge[0]; r[0][1] = edge[0]; r[1][1] = edge[1]; @@ -419,7 +419,7 @@ bool Decompose::QRDecomposition_stable( const type::Mat<2,2,Real> &M, type } else { - // edgex not colapsed + // edgex not collapsed edge /= helper::rsqrt(n); r[0][0] = edge[0]; r[1][0] = edge[1]; r[0][1] = -edge[1]; r[1][1] = edge[0]; @@ -1019,7 +1019,7 @@ bool Decompose::polarDecomposition_stable_Gradient_dQOverdM( const type::M } - // transposed and reformated in 9x9 matrice + // transposed and reformatted in 9x9 matrice for( int i=0 ; i<3 ; ++i ) for( int j=0 ; j<3 ; ++j ) for( int k=0 ; k<3 ; ++k ) @@ -1052,7 +1052,7 @@ bool Decompose::polarDecompositionGradient_dQOverdM( const type::Mat<3,2,R dQdMij[i][j] = U * omega * V; } - // transposed and reformated in plain matrice + // transposed and reformatted in plain matrice for( int k=0 ; k<3 ; ++k ) for( int l=0 ; l<2 ; ++l ) for( int j=0 ; j<2 ; ++j ) @@ -2130,7 +2130,7 @@ bool Decompose::SVDGradient_dUdVOverdM( const type::Mat<3,3,Real> &U, cons // dV[i][j] += omegaV[i*3+j][k*3+l] * dM[k][l]; // } - // transposed and reformated in 9x9 matrices + // transposed and reformatted in 9x9 matrices for( int i=0 ; i<3 ; ++i ) for( int j=0 ; j<3 ; ++j ) for( int k=0 ; k<3 ; ++k ) @@ -2205,7 +2205,7 @@ bool Decompose::SVDGradient_dUdVOverdM( const type::Mat<3,2,Real> &U, cons dVdMij[i][j] = omegaV * V; } - // transposed and reformated in plain matrices + // transposed and reformatted in plain matrices for( int k=0 ; k<3 ; ++k ) for( int l=0 ; l<2 ; ++l ) for( int j=0 ; j<2 ; ++j ) diff --git a/Sofa/framework/Helper/src/sofa/helper/deque.h b/Sofa/framework/Helper/src/sofa/helper/deque.h index 48435321748..5830e69abd4 100644 --- a/Sofa/framework/Helper/src/sofa/helper/deque.h +++ b/Sofa/framework/Helper/src/sofa/helper/deque.h @@ -70,7 +70,7 @@ std::istream& operator>> ( std::istream& in, std::deque& d ) /// Input stream -/// Specialization for reading deques of int and unsigned int using "A-B" notation for all integers between A and B, optionnally specifying a step using "A-B-step" notation. +/// Specialization for reading dequeues of int and unsigned int using "A-B" notation for all integers between A and B, optionally specifying a step using "A-B-step" notation. template<> inline std::istream& operator>>( std::istream& in, std::deque& d ) { @@ -129,7 +129,7 @@ inline std::istream& operator>>( std::istream& in, std::deque& d ) } /// Output stream -/// Specialization for writing deques of unsigned char +/// Specialization for writing dequeues of unsigned char template<> inline std::ostream& operator<<(std::ostream& os, const std::deque& d) { @@ -142,8 +142,8 @@ inline std::ostream& operator<<(std::ostream& os, const std::deque inline std::istream& operator>>(std::istream& in, std::deque& d) { @@ -158,7 +158,7 @@ inline std::istream& operator>>(std::istream& in, std::deque& d) } /// Input stream -/// Specialization for reading deques of int and unsigned int using "A-B" notation for all integers between A and B +/// Specialization for reading dequeues of int and unsigned int using "A-B" notation for all integers between A and B template<> inline std::istream& operator>>( std::istream& in, std::deque& d ) { diff --git a/Sofa/framework/Helper/src/sofa/helper/io/SphereLoader.h b/Sofa/framework/Helper/src/sofa/helper/io/SphereLoader.h index 9a76ec850a2..fb7cc8e28f2 100644 --- a/Sofa/framework/Helper/src/sofa/helper/io/SphereLoader.h +++ b/Sofa/framework/Helper/src/sofa/helper/io/SphereLoader.h @@ -46,7 +46,7 @@ class SOFA_HELPER_API SphereLoaderDataHook /// This method is called by the XspLoader when the loading is done. /// Overriding this method allows client-code to implement post-loading checking. /// @param isOk is set to false this means that the loading code detected a - /// problem and that the loaded informations are invalid and should be removed from + /// problem and that the loaded information are invalid and should be removed from /// the container. virtual void finalizeLoading(const bool isOk){ SOFA_UNUSED(isOk); } @@ -67,7 +67,7 @@ class SOFA_HELPER_API SphereLoader /// @param filename the name of the file in the RessourceRepository to read data from. /// @param data pass a object of this type (or inherit one) to load the file in caller's data /// structures - /// @return wheter the loading succeded. + /// @return whether the loading succeeded. /// @example /// class MySphereData : public SphereLoaderDataHook /// { diff --git a/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.cpp b/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.cpp index 0250e757555..3f32b2416b5 100644 --- a/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.cpp @@ -50,7 +50,7 @@ bool XspLoader::ReadXspContent(std::ifstream &file, size_t numTotalMasses=0; size_t numTotalSpring=0; - /// Temporarily stores the masses while loading for the initpos calculs in the + /// Temporarily stores the masses while loading for the initpos calculus in the /// 'lspg' command. std::vector masses; while (!file.eof()) diff --git a/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.h b/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.h index 0f8500f0b13..eea3bf18d01 100644 --- a/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.h +++ b/Sofa/framework/Helper/src/sofa/helper/io/XspLoader.h @@ -51,7 +51,7 @@ class SOFA_HELPER_API XspLoaderDataHook /// This method is called by the XspLoader when the loading is done. /// Overriding this method allows client-code to implement post-loading checking. /// @param isOk is set to false this means that the loading code detected a - /// problem and that the loaded informations are invalid and should be removed from + /// problem and that the loaded information are invalid and should be removed from /// the container. virtual void finalizeLoading(bool isOk) { SOFA_UNUSED(isOk); } @@ -94,7 +94,7 @@ class SOFA_HELPER_API XspLoader /// @param filename the name of the file in the RessourceRepository to read data from. /// @param data pass a object of this type (or inherit one) to load the file in caller's data /// structures - /// @return wheter the loading succeded. + /// @return whether the loading succeeded. /// @example /// class MyXspLoader : public XspLoaderDataHook /// { diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/ComponentInfo.h b/Sofa/framework/Helper/src/sofa/helper/logging/ComponentInfo.h index 25748390eac..341f3a6d1f1 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/ComponentInfo.h +++ b/Sofa/framework/Helper/src/sofa/helper/logging/ComponentInfo.h @@ -37,7 +37,7 @@ namespace sofa::helper::logging { -/// The base class to keep track of informations associated with a message. +/// The base class to keep track of information associated with a message. /// A component info object have a sender method to return the name string identifying the /// sender of a message. /// diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/CountingMessageHandler.h b/Sofa/framework/Helper/src/sofa/helper/logging/CountingMessageHandler.h index a99e6be1a83..207a1ffd510 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/CountingMessageHandler.h +++ b/Sofa/framework/Helper/src/sofa/helper/logging/CountingMessageHandler.h @@ -35,7 +35,7 @@ namespace sofa::helper::logging { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. +/// fearing it will leak names into the global namespace. /// When closing this namespace selected objects from this per-file namespace /// are then imported into their parent namespace for ease of use. namespace countingmessagehandler diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/ExceptionMessageHandler.cpp b/Sofa/framework/Helper/src/sofa/helper/logging/ExceptionMessageHandler.cpp index e60adc38ade..18774725a15 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/ExceptionMessageHandler.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/logging/ExceptionMessageHandler.cpp @@ -37,7 +37,7 @@ namespace sofa::helper::logging { if( m.type()>=Message::Error ) { - ErrorMessageException errorMessageException/*(some Message's informations could be added to the exception)*/; + ErrorMessageException errorMessageException/*(some Message's information could be added to the exception)*/; throw errorMessageException; } } diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/FileMessageHandler.cpp b/Sofa/framework/Helper/src/sofa/helper/logging/FileMessageHandler.cpp index c95ed1414d2..b3fad6bbf02 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/FileMessageHandler.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/logging/FileMessageHandler.cpp @@ -39,7 +39,7 @@ FileMessageHandler::FileMessageHandler(const char* filename,MessageFormatter *fo m_formatter = (formatter==nullptr?&DefaultStyleMessageFormatter::getInstance():formatter); m_outFile.open(filename,std::ios_base::out | std::ios_base::trunc); if (!m_outFile.is_open()) - msg_error("FileMessageHandler") << "Could not open outpout log file: " << filename; + msg_error("FileMessageHandler") << "Could not open output log file: " << filename; } FileMessageHandler::~FileMessageHandler() diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/LoggingMessageHandler.h b/Sofa/framework/Helper/src/sofa/helper/logging/LoggingMessageHandler.h index c274426eefd..9ba0cd4b4b1 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/LoggingMessageHandler.h +++ b/Sofa/framework/Helper/src/sofa/helper/logging/LoggingMessageHandler.h @@ -35,7 +35,7 @@ namespace sofa::helper::logging { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. +/// fearing it will leak names into the global namespace. /// When closing this namespace selected objects from this per-file namespace /// are then imported into their parent namespace for ease of use. namespace loggingmessagehandler @@ -49,7 +49,7 @@ using std::vector ; /// Once set the class can start copying the messages passing through /// the MessageDispatcher in a buffer. /// -/// Dedicated function allows to activate/deactive the saving of the messages as well +/// Dedicated function allows to activate/deactivate the saving of the messages as well /// as to clear the content of the buffer. The class keeps tracks of its /// number of activation/deactivation. Message logging is activated as long /// as there is not a paired number of activation/deactivation. diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/Messaging.h b/Sofa/framework/Helper/src/sofa/helper/logging/Messaging.h index 1f4e0c98286..a3697793746 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/Messaging.h +++ b/Sofa/framework/Helper/src/sofa/helper/logging/Messaging.h @@ -52,7 +52,7 @@ * - a (possibly empty) backtrace * - the source file and line from where the messaging was emitted. * - * for any usefull purpose, a messaging needs to be send to + * for any useful purpose, a messaging needs to be send to * a MessageHandler either using an object or using the singleton/static * part of the API. * diff --git a/Sofa/framework/Helper/src/sofa/helper/logging/RoutingMessageHandler.h b/Sofa/framework/Helper/src/sofa/helper/logging/RoutingMessageHandler.h index 06096b9dca4..cd1a648dbca 100644 --- a/Sofa/framework/Helper/src/sofa/helper/logging/RoutingMessageHandler.h +++ b/Sofa/framework/Helper/src/sofa/helper/logging/RoutingMessageHandler.h @@ -35,7 +35,7 @@ namespace sofa::helper::logging { /// I use a per-file namespace so that I can employ the 'using' keywords without -/// fearing it will leack names into the global namespace. +/// fearing it will leak names into the global namespace. /// When closing this namespace selected objects from this per-file namespace /// are then imported into their parent namespace for ease of use. namespace routingmessagehandler diff --git a/Sofa/framework/Helper/src/sofa/helper/random.h b/Sofa/framework/Helper/src/sofa/helper/random.h index 764d8f907a2..5e40088d6f7 100644 --- a/Sofa/framework/Helper/src/sofa/helper/random.h +++ b/Sofa/framework/Helper/src/sofa/helper/random.h @@ -65,7 +65,7 @@ inline double drand(double max) } // Random double in [-max,-min] U [min,max] -// min and max must be positve +// min and max must be positive inline double drand(double min, double max) { assert( max >= 0 ); diff --git a/Sofa/framework/Helper/src/sofa/helper/set.cpp b/Sofa/framework/Helper/src/sofa/helper/set.cpp index abf36aa05fc..84e1a4ce9e2 100644 --- a/Sofa/framework/Helper/src/sofa/helper/set.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/set.cpp @@ -35,7 +35,7 @@ namespace std { /// Input stream -/// Specialization for reading sets of int and unsigned int using "A-B" notation for all integers between A and B, optionnally specifying a step using "A-B-step" notation. +/// Specialization for reading sets of int and unsigned int using "A-B" notation for all integers between A and B, optionally specifying a step using "A-B-step" notation. template<> std::istream& operator>> ( std::istream& in, std::set& _set ) { diff --git a/Sofa/framework/Helper/src/sofa/helper/set.h b/Sofa/framework/Helper/src/sofa/helper/set.h index 19fa3a46995..cae4e2084be 100644 --- a/Sofa/framework/Helper/src/sofa/helper/set.h +++ b/Sofa/framework/Helper/src/sofa/helper/set.h @@ -60,7 +60,7 @@ std::istream& operator>> ( std::istream& i, std::set& s ) } /// Input stream -/// Specialization for reading sets of int and unsigned int using "A-B" notation for all integers between A and B, optionnally specifying a step using "A-B-step" notation. +/// Specialization for reading sets of int and unsigned int using "A-B" notation for all integers between A and B, optionally specifying a step using "A-B-step" notation. template<> SOFA_HELPER_API std::istream& operator>> ( std::istream& in, std::set& _set ); /// Input stream diff --git a/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.cpp b/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.cpp index 7b11f893c5b..9fbef88b423 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.cpp @@ -62,7 +62,7 @@ using sofa::helper::system::FileSystem; namespace sofa::helper::system { -// replacing every occurences of "//" by "/" +// replacing every occurrences of "//" by "/" std::string cleanPath( const std::string& path ) { std::string p = path; @@ -174,7 +174,7 @@ std::string FileRepository::cleanPath(const std::string& path) void FileRepository::addFirstPath(const std::string& p) { - // replacing every occurences of "//" by "/" + // replacing every occurrences of "//" by "/" std::string path = FileSystem::cleanPath(p); std::vector entries; @@ -194,7 +194,7 @@ void FileRepository::addFirstPath(const std::string& p) void FileRepository::addLastPath(const std::string& p) { - // replacing every occurences of "//" by "/" + // replacing every occurrences of "//" by "/" std::string path = FileSystem::cleanPath(p); std::vector entries; diff --git a/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.h b/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.h index 945ac8e1bb5..06d155796a1 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.h +++ b/Sofa/framework/Helper/src/sofa/helper/system/FileRepository.h @@ -78,14 +78,14 @@ class SOFA_HELPER_API FileRepository /** * Initialize the set of paths using the environment variable specified by the parameter envVar, the relative path - * specified by the parameter relativePath and the ini files and respective keys specified by the paramter iniFilesAndKeys. + * specified by the parameter relativePath and the ini files and respective keys specified by the parameter iniFilesAndKeys. */ FileRepository(const char* envVar, const char* relativePath, const fileKeysMap& iniFilesAndKeys) : FileRepository(envVar, {relativePath?std::string(relativePath):""}, iniFilesAndKeys) {} /** * Initialize the set of paths using the environment variable specified by the parameter envVar, the relative paths - * specified by the parameter paths and the ini files and respective keys specified by the paramter iniFilesAndKeys. + * specified by the parameter paths and the ini files and respective keys specified by the parameter iniFilesAndKeys. */ FileRepository(const char* envVar, const std::vector & paths, const fileKeysMap& iniFilesAndKeys); @@ -145,7 +145,7 @@ class SOFA_HELPER_API FileRepository void print(); - /// OS-dependant character separing entries in list of paths. + /// OS-dependant character separating entries in list of paths. static char entrySeparator() { #ifdef WIN32 diff --git a/Sofa/framework/Helper/src/sofa/helper/system/console_internal.h b/Sofa/framework/Helper/src/sofa/helper/system/console_internal.h index efcd1e8e8fa..5100c4978ff 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/console_internal.h +++ b/Sofa/framework/Helper/src/sofa/helper/system/console_internal.h @@ -33,7 +33,7 @@ namespace internal { inline bool isMsysPty(int fd) noexcept { - // Dynamic load for binary compability with old Windows + // Dynamic load for binary compatibility with old Windows const auto ptrGetFileInformationByHandleEx = reinterpret_cast( GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), diff --git a/Sofa/framework/Helper/src/sofa/helper/system/thread/CTime.h b/Sofa/framework/Helper/src/sofa/helper/system/thread/CTime.h index 82a9e31f4e6..eb352dc625c 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/thread/CTime.h +++ b/Sofa/framework/Helper/src/sofa/helper/system/thread/CTime.h @@ -61,7 +61,7 @@ class SOFA_HELPER_API CTime // Get the frequency of the fast timer static ctime_t getTicksPerSec(); - // Same as getFastTime, but with the additionnal guaranty that it will never decrease. + // Same as getFastTime, but with the additional guaranty that it will never decrease. static /*volatile*/ ctime_t getTime(); // Sleep for the given duration in second diff --git a/Sofa/framework/Helper/src/sofa/helper/system/thread/thread_specific_ptr.h b/Sofa/framework/Helper/src/sofa/helper/system/thread/thread_specific_ptr.h index c8fdf7e3abd..0ac2e16008a 100644 --- a/Sofa/framework/Helper/src/sofa/helper/system/thread/thread_specific_ptr.h +++ b/Sofa/framework/Helper/src/sofa/helper/system/thread/thread_specific_ptr.h @@ -57,7 +57,7 @@ class thread_specific_ptr pthread_key_t key; thread_specific_ptr(thread_specific_ptr&); // NO COPY - thread_specific_ptr& operator=(thread_specific_ptr&); // NO ASSIGNEMENT + thread_specific_ptr& operator=(thread_specific_ptr&); // NO ASSIGNMENT T* get() const { diff --git a/Sofa/framework/Helper/src/sofa/helper/visual/Trackball.h b/Sofa/framework/Helper/src/sofa/helper/visual/Trackball.h index d5f1a700c70..2f9b0d2d1cd 100644 --- a/Sofa/framework/Helper/src/sofa/helper/visual/Trackball.h +++ b/Sofa/framework/Helper/src/sofa/helper/visual/Trackball.h @@ -66,7 +66,7 @@ * the mouse, scaled so they are from (-1.0 ... 1.0). * * The resulting rotation is returned as a quaternion rotation in the - * first paramater. + * first parameter. */ #pragma once diff --git a/Sofa/framework/Helper/src/sofa/helper/visual/Transformation.cpp b/Sofa/framework/Helper/src/sofa/helper/visual/Transformation.cpp index deeb4b4afdd..b75c5255127 100644 --- a/Sofa/framework/Helper/src/sofa/helper/visual/Transformation.cpp +++ b/Sofa/framework/Helper/src/sofa/helper/visual/Transformation.cpp @@ -88,7 +88,7 @@ Transformation& Transformation::operator=(const Transformation& transform) //---------------------------------------------------------------------------- //--- Inversion for 4x4 matrix only containing rotations and translations -//--- Transpose rotation matrix and mutiple by -1 translation row +//--- Transpose rotation matrix and multiple by -1 translation row //---------------------------------------------------------------------------- void Transformation::InvertTransRotMatrix(SReal matrix[4][4]) { @@ -115,7 +115,7 @@ void Transformation::InvertTransRotMatrix(SReal matrix[4][4]) //---------------------------------------------------------------------------- //--- Invert the source matrix sMatrix and put the result in the destination matrix dMatrix //--- Inversion for 4x4 matrix only containing rotations and translations -//--- Transpose rotation matrix and mutiple by -1 translation row +//--- Transpose rotation matrix and multiple by -1 translation row //---------------------------------------------------------------------------- void Transformation::InvertTransRotMatrix(SReal sMatrix[4][4], SReal dMatrix[4][4]) diff --git a/Sofa/framework/Helper/test/system/FileMonitor_test.cpp b/Sofa/framework/Helper/test/system/FileMonitor_test.cpp index 810a15e9a55..80cf2d594fd 100644 --- a/Sofa/framework/Helper/test/system/FileMonitor_test.cpp +++ b/Sofa/framework/Helper/test/system/FileMonitor_test.cpp @@ -86,7 +86,7 @@ void waitUntilFileExists(const std::string& filename, double timeout) void waitABit() { - // on windows we use file date, which resoution is assumed (by us) to be below this value in ms + // on windows we use file date, which resolution is assumed (by us) to be below this value in ms #ifdef WIN32 std::this_thread::sleep_for(std::chrono::milliseconds(100)); #endif diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/EigenSparseMatrix.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/EigenSparseMatrix.h index 407d07a198b..1b66df5cadd 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/EigenSparseMatrix.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/EigenSparseMatrix.h @@ -201,7 +201,7 @@ class EigenSparseMatrix : public EigenBaseSparseMatrix class SOFA_LINEARALGEBRA_API LPtrFullMatrix : public FullMatrix { diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.cpp b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.cpp index 2eec21e2375..8f7a7a00473 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.cpp +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.cpp @@ -132,7 +132,7 @@ void RotationMatrix::opMulTV(linearalgebra::BaseVector* result, const line } } -/// multiply the transpose current matrix by m matrix and strore the result in m +/// multiply the transpose current matrix by m matrix and store the result in m template void RotationMatrix::opMulTM(linearalgebra::BaseMatrix * bresult,linearalgebra::BaseMatrix * bm) const { diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.h index 591131a7e12..1b003566ef4 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/RotationMatrix.h @@ -78,7 +78,7 @@ class RotationMatrix : public linearalgebra::BaseMatrix void opMulV(linearalgebra::BaseVector* result, const linearalgebra::BaseVector* v) const override; void opMulTV(linearalgebra::BaseVector* result, const linearalgebra::BaseVector* v) const override; - /// multiply the transpose current matrix by m matrix and strore the result in m + /// multiply the transpose current matrix by m matrix and store the result in m void opMulTM(linearalgebra::BaseMatrix * bresult,linearalgebra::BaseMatrix * bm) const override; void rotateMatrix(linearalgebra::BaseMatrix * mat,const linearalgebra::BaseMatrix * Jmat); diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/SparseMatrixStorageOrder.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/SparseMatrixStorageOrder.h index 4c38d785f28..8e8f34e3422 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/SparseMatrixStorageOrder.h +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/SparseMatrixStorageOrder.h @@ -33,7 +33,7 @@ namespace sofa::linearalgebra * The output is not really a matrix per se, but a data structure representing the opposite representation. * It also provides a permutation array, that allows to retrieve the initial value of a matrix entry in the input matrix. * - * As mentionned, the output is not a matrix, but a dedicated iterator allows to loop over non-zero entries, in a similar + * As mentioned, the output is not a matrix, but a dedicated iterator allows to loop over non-zero entries, in a similar * fashion than in Eigen. * * If only values of the input matrix change, but not its pattern, the output matrix will not change. And the iterator diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in index 485f2ec960a..34e06b81345 100644 --- a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in +++ b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/config.h.in @@ -57,7 +57,7 @@ #define SOFA_ATTRIBUTE_DISABLED__CRS_BLOCK_RENAMING() \ SOFA_ATTRIBUTE_DISABLED( \ "v23.06", "v23.12", \ - "bloc has been renamed to block. ") + "block has been renamed to block. ") #endif // SOFA_BUILD_SOFA_LINEARALGEBRA diff --git a/Sofa/framework/LinearAlgebra/test/Matrix_test.cpp b/Sofa/framework/LinearAlgebra/test/Matrix_test.cpp index 443573d6dc1..45c2b38bd4f 100644 --- a/Sofa/framework/LinearAlgebra/test/Matrix_test.cpp +++ b/Sofa/framework/LinearAlgebra/test/Matrix_test.cpp @@ -22,7 +22,7 @@ /** Sparse matrix test suite. * - * The same suite is instanciated using different parameters: entry types + * The same suite is instantiated using different parameters: entry types * (float/Real) and BlockMN size in CompressedRowSparse. */ @@ -300,7 +300,7 @@ struct TestSparseMatrices : public NumericTest mb.beginBlockRow(i); if( i%2==0 ) // leave some rows empty { - for( int j=bc-1; j>=0; j--) // set the blocs in reverse order, for fun. + for( int j=bc-1; j>=0; j--) // set the blocks in reverse order, for fun. { // create a block and give it some value BlockMN b; @@ -327,7 +327,7 @@ struct TestSparseMatrices : public NumericTest mb.beginBlockRow(i); if( i%2==0 ) // leave some rows empty { - for( unsigned j=0 ; j { if( i%2==0 ) // leave some rows empty { - for( int j=bc-1; j>=0; j--) // set the blocs in reverse order, for fun. + for( int j=bc-1; j>=0; j--) // set the blocks in reverse order, for fun. { // create a block and give it some value BlockMN b; diff --git a/Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml/Element.inl b/Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml/Element.inl index 9bfa070374c..fdd2cc7f053 100644 --- a/Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml/Element.inl +++ b/Sofa/framework/Simulation/Common/src/sofa/simulation/common/xml/Element.inl @@ -60,4 +60,4 @@ sofa::core::objectmodel::Base* Element::getObject() //template class Factory< std::string, Object, Node* >; -} // namespace sofa::simlation::xml +} // namespace sofa::simulation::xml diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp index c39855e9e8e..f5d36848ed4 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseMechanicalVisitor.cpp @@ -50,7 +50,7 @@ const std::string BaseMechanicalVisitor::bwdVisitorType = "bwd"; BaseMechanicalVisitor::BaseMechanicalVisitor(const sofa::core::ExecParams *params) : Visitor(params), root(nullptr), rootData(nullptr) { - // mechanical visitors shouldn't be able to acess a sleeping node, only visual visitor should + // mechanical visitors shouldn't be able to access a sleeping node, only visual visitor should canAccessSleepingNode = false; } diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseSimulationExporter.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseSimulationExporter.h index 361af5dd189..bddb7c72660 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseSimulationExporter.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/BaseSimulationExporter.h @@ -39,8 +39,8 @@ using sofa::core::objectmodel::BaseObject ; using sofa::core::objectmodel::DataFileName ; /** - Componant that export something from the scene could inherit from this class - as it implement an uniform handling of the differen data attributes. + Component that export something from the scene could inherit from this class + as it implement an uniform handling of the different data attributes. */ class SOFA_SIMULATION_CORE_API BaseSimulationExporter : public virtual BaseObject { diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/CollisionAnimationLoop.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/CollisionAnimationLoop.h index d8bf0296318..6d956e3fd73 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/CollisionAnimationLoop.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/CollisionAnimationLoop.h @@ -41,7 +41,7 @@ namespace sofa::simulation * This class can optionally replace the default computation scheme of computing * collisions then doing an integration step. * - * Note that it is in a preliminary stage, hence its fonctionnalities and API will + * Note that it is in a preliminary stage, hence its functionalities and API will * certainly change soon. * */ diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Colors.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Colors.h index f305ecd50bd..9681542aeaa 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Colors.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Colors.h @@ -70,7 +70,7 @@ static const char* COLOR[ALLCOLORS]= /*ForceField =*/ "#bebada", // color 3 /*Solver =*/ "#b3de69", // color 7 /*CollisionPipeline =*/ "#bc80bd", // color 10 - /*MechanicalMapping =*/ "#4ba3fa", // color spectral4/4 (brigher) + /*MechanicalMapping =*/ "#4ba3fa", // color spectral4/4 (brighter) /*Mapping =*/ "#80b1d3", // color 5 /*Mass =*/ "#ffffb3", // color 2 /*Topology =*/ "#ffed6f", // color 12 diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h index 271c83e4892..0f6d4aa7d54 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Node.h @@ -71,7 +71,7 @@ class NodeSequence : public MultiLink class NodeSingle : public SingleLink @@ -175,7 +175,7 @@ class SOFA_SIMULATION_CORE_API Node : public sofa::core::objectmodel::BaseNode, /// @name Visitor handling /// @param precomputedOrder is not used by default but could allow optimization on certain Node specializations - /// @warning when calling with precomputedOrder=true, the fonction "precomputeTraversalOrder" must be called before executing the visitor and the user must ensure by himself that the simulation graph has done been modified since the last call to "precomputeTraversalOrder" + /// @warning when calling with precomputedOrder=true, the function "precomputeTraversalOrder" must be called before executing the visitor and the user must ensure by himself that the simulation graph has done been modified since the last call to "precomputeTraversalOrder" /// @{ /// Execute a recursive action starting from this node. @@ -494,7 +494,7 @@ class SOFA_SIMULATION_CORE_API Node : public sofa::core::objectmodel::BaseNode, /// Update the simulation context values(gravity, time...), based on parent and local ContextObjects virtual void updateSimulationContext(); - /// Called during initialization to corectly propagate the visual context to the children + /// Called during initialization to correctly propagate the visual context to the children virtual void initVisualContext() {} /// Propagate an event @@ -565,7 +565,7 @@ class SOFA_SIMULATION_CORE_API Node : public sofa::core::objectmodel::BaseNode, virtual void addListener(MutationListener* obj); virtual void removeListener(MutationListener* obj); - /// @name virtual functions to add/remove some special components direclty in the right Sequence + /// @name virtual functions to add/remove some special components directly in the right Sequence /// @{ #define NODE_DECLARE_SEQUENCE_ACCESSOR( CLASSNAME, FUNCTIONNAME, SEQUENCENAME ) \ diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelForEach.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelForEach.h index 0ac1a730ad4..6eaf4b669c0 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelForEach.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/ParallelForEach.h @@ -59,7 +59,7 @@ void advance(InputIt& it, Distance n) * The number of ranges depends on: * 1) the desired number of ranges provided in a parameter * 2) the number of elements in the container - * The number of elements in each range is homogenous, except for the last range which may contain + * The number of elements in each range is homogeneous, except for the last range which may contain * more elements. */ template @@ -148,7 +148,7 @@ UnaryFunction forEachRange(InputIt first, InputIt last, UnaryFunction f) * void fun(const Range& a); * The signature does not need to have const &. * - * A task scheduler must be provided and correctly initiallized. The number of generated ranges + * A task scheduler must be provided and correctly initialized. The number of generated ranges * depends on the threads available in the task scheduler. */ template diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp index 7c4d93092c4..11aed4347e0 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp @@ -38,7 +38,7 @@ int RequiredPluginClass = core::RegisterObject("Load the required plugins") RequiredPlugin::RequiredPlugin() : d_pluginName( initData(&d_pluginName, "pluginName", "plugin name (or several names if you need to load different plugins or a plugin with several alternate names)")) - , d_suffixMap ( initData(&d_suffixMap , "suffixMap", "standard->custom suffixes pairs (to be used if the plugin is compiled outside of Sofa with a non standard way of differenciating versions), using ! to represent empty suffix")) + , d_suffixMap ( initData(&d_suffixMap , "suffixMap", "standard->custom suffixes pairs (to be used if the plugin is compiled outside of Sofa with a non standard way of differentiating versions), using ! to represent empty suffix")) , d_stopAfterFirstNameFound( initData(&d_stopAfterFirstNameFound , false, "stopAfterFirstNameFound", "Stop after the first plugin name that is loaded successfully")) , d_stopAfterFirstSuffixFound( initData(&d_stopAfterFirstSuffixFound , true, "stopAfterFirstSuffixFound", "For each plugin name, stop after the first suffix that is loaded successfully")) , d_requireOne ( initData(&d_requireOne , false, "requireOne", "Display an error message if no plugin names were successfully loaded")) diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.h index a20e2446d16..b2e3b8c0fde 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.h @@ -34,7 +34,7 @@ class SOFA_SIMULATION_CORE_API RequiredPlugin : public core::objectmodel::BaseOb public: SOFA_CLASS(RequiredPlugin,core::objectmodel::BaseObject); sofa::core::objectmodel::Data > d_pluginName; ///< plugin name (or several names if you need to load different plugins or a plugin with several alternate names) - sofa::core::objectmodel::Data > > d_suffixMap; ///< standard->custom suffixes pairs (to be used if the plugin is compiled outside of Sofa with a non standard way of differenciating versions), using ! to represent empty suffix + sofa::core::objectmodel::Data > > d_suffixMap; ///< standard->custom suffixes pairs (to be used if the plugin is compiled outside of Sofa with a non standard way of differentiating versions), using ! to represent empty suffix sofa::core::objectmodel::Data d_stopAfterFirstNameFound; ///< Stop after the first plugin name that is loaded successfully sofa::core::objectmodel::Data d_stopAfterFirstSuffixFound; ///< For each plugin name, stop after the first suffix that is loaded successfully diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Task.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Task.h index 2d7a8c65bff..4d2530cdf23 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Task.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Task.h @@ -78,7 +78,7 @@ class SOFA_SIMULATION_CORE_API Task // no array new and delete operators static void* operator new[](std::size_t sz) = delete; - // visual studio 2015 complains about the = delete but it doens't explain where this operator is call + // visual studio 2015 complains about the = delete but it doesn't explain where this operator is call // no problem with other sompilers included visual studio 2017 // static void operator delete[](void* ptr) = delete; diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/UpdateLinksVisitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/UpdateLinksVisitor.cpp index 272219dc966..97e93d0936f 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/UpdateLinksVisitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/UpdateLinksVisitor.cpp @@ -39,7 +39,7 @@ Visitor::Result UpdateLinksVisitor::processNodeTopDown(simulation::Node* node) this->processObject(it->get()); } - //TODO(dmarchal): why do we clear the messsage logs when we update the links ? + //TODO(dmarchal): why do we clear the message logs when we update the links ? //node->clearLoggedMessages(); node->clearLoggedMessages(); return RESULT_CONTINUE; } diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.cpp index b3ca2bb4a72..9ae3a127876 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.cpp +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.cpp @@ -42,7 +42,7 @@ void Visitor::execute(sofa::core::objectmodel::BaseContext* c, bool precomputedO c->executeVisitor(this, precomputedOrder); } -//method to compare the tags of the objet with the ones of the visitor +//method to compare the tags of the object with the ones of the visitor // return true if the object has all the tags of the visitor // or if no tag is set to the visitor bool Visitor::testTags(core::objectmodel::BaseObject* obj) diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h index d0644b7591a..a9815fd6f19 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/Visitor.h @@ -63,7 +63,7 @@ class SOFA_SIMULATION_CORE_API Visitor enum Result { RESULT_CONTINUE, RESULT_PRUNE }; - /// Callback method called when decending to a new node. Recursion will stop if this method returns RESULT_PRUNE + /// Callback method called when descending to a new node. Recursion will stop if this method returns RESULT_PRUNE virtual Result processNodeTopDown(simulation::Node* /*node*/) { return RESULT_CONTINUE; } /// Callback method called after child node have been processed and before going back to the parent node. @@ -129,7 +129,7 @@ class SOFA_SIMULATION_CORE_API Visitor public: - //method to compare the tags of the objet with the ones of the visitor + //method to compare the tags of the object with the ones of the visitor // return true if the object has all the tags of the visitor // or if no tag is set to the visitor bool testTags(sofa::core::objectmodel::BaseObject* obj); @@ -158,7 +158,7 @@ class SOFA_SIMULATION_CORE_API Visitor /// Specify whether this visitor can be parallelized. virtual bool isThreadSafe() const { return false; } - /// Callback method called when decending to a new node. Recursion will stop if this method returns RESULT_PRUNE + /// Callback method called when descending to a new node. Recursion will stop if this method returns RESULT_PRUNE /// This version is offered a LocalStorage to store temporary data SOFA_ATTRIBUTE_DISABLED_LOCALSTORAGE() virtual Result processNodeTopDown(simulation::Node* node, LocalStorage*) = delete; @@ -216,7 +216,7 @@ class SOFA_SIMULATION_CORE_API Visitor static int GetRangeStateVector() {return rangeStateVector;} protected: - static std::ostream *outputVisitor; //Ouput stream to dump the info + static std::ostream *outputVisitor; //Output stream to dump the info static bool printActivated; //bool to know if the stream is opened or not static bool outputStateVector; //bool to know if we trace the evolution of the state vectors static unsigned int firstIndexStateVector; //numero of the first index of the particules to trace diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalAccumulateMatrixDeriv.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalAccumulateMatrixDeriv.h index edd299a530b..7a1ad74c1e5 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalAccumulateMatrixDeriv.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalAccumulateMatrixDeriv.h @@ -28,7 +28,7 @@ namespace sofa::simulation::mechanicalvisitor { -/// Accumulate Jacobian matrices through the mappings up to the independant DOFs +/// Accumulate Jacobian matrices through the mappings up to the independent DOFs class SOFA_SIMULATION_CORE_API MechanicalAccumulateMatrixDeriv : public BaseMechanicalVisitor { public: diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalApplyProjectiveConstraint_ToMatrixVisitor.h b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalApplyProjectiveConstraint_ToMatrixVisitor.h index 1fac9203464..10337cc4078 100644 --- a/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalApplyProjectiveConstraint_ToMatrixVisitor.h +++ b/Sofa/framework/Simulation/Core/src/sofa/simulation/mechanicalvisitor/MechanicalApplyProjectiveConstraint_ToMatrixVisitor.h @@ -26,7 +26,7 @@ namespace sofa::simulation::mechanicalvisitor { -/** Apply projective constaints of the whole scene */ +/** Apply projective constraints of the whole scene */ class SOFA_SIMULATION_CORE_API MechanicalApplyProjectiveConstraint_ToMatrixVisitor : public MechanicalVisitor { public: diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.cpp b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.cpp index 3b66fec04fd..e5aefe44341 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.cpp +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.cpp @@ -522,7 +522,7 @@ sofa::core::topology::BaseMeshTopology* DAGNode::getMeshTopologyLink(SearchDirec void DAGNode::precomputeTraversalOrder( const sofa::core::ExecParams* params ) { - // acumulating traversed Nodes + // accumulating traversed Nodes class TraversalOrderVisitor : public Visitor { NodeList& _orderList; @@ -594,7 +594,7 @@ void DAGNode::doExecuteVisitor(simulation::Visitor* action, bool precomputedOrde // // A child node is visited only when all its parents have been visited. // A child node is 'pruned' only if all its parents are 'pruned'. - // Every excecuted node in the forward traversal are stored in 'executedNodes', + // Every executed node in the forward traversal are stored in 'executedNodes', // its reverse order is used for the backward traversal. // Note that a newly 'pruned' node is still traversed (w/o execution) to be sure to execute its child nodes, diff --git a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h index a428d6abd0e..d258e206705 100644 --- a/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h +++ b/Sofa/framework/Simulation/Graph/src/sofa/simulation/graph/DAGNode.h @@ -128,7 +128,7 @@ class SOFA_SIMULATION_GRAPH_API DAGNode : public simulation::Node /// return the smallest common parent between this and node2 (returns nullptr if separated sub-graphes) /// it assumes that the DAG node is a tree node. In case of multiple parents it returns any of the parents. - /// it uses the node descendancy informations. + /// it uses the node descendancy information. Node* findCommonParent( Node* node2 ) override; /// compute the traversal order from this Node diff --git a/Sofa/framework/Testing/src/sofa/testing/TestMessageHandler.h b/Sofa/framework/Testing/src/sofa/testing/TestMessageHandler.h index 4e2a32b15d3..9f5cab3617c 100644 --- a/Sofa/framework/Testing/src/sofa/testing/TestMessageHandler.h +++ b/Sofa/framework/Testing/src/sofa/testing/TestMessageHandler.h @@ -131,7 +131,7 @@ class SOFA_TESTING_API MainGtestMessageHandler /// Using the raw objects is very verbose as it lead to code like this: /// ExpectMessage error(Message::Error, __FILE__, __LINE__) ; /// -/// which obfuscate the readability of the source code and force developper to import +/// which obfuscate the readability of the source code and force developer to import /// ExpectMessage and Message into the current namespace. /// /// For that reason we are provide a set of macro that can be used in the following way: diff --git a/Sofa/framework/Testing/test/TestMessageHandler_test.cpp b/Sofa/framework/Testing/test/TestMessageHandler_test.cpp index f38b507f33f..a15300da93a 100644 --- a/Sofa/framework/Testing/test/TestMessageHandler_test.cpp +++ b/Sofa/framework/Testing/test/TestMessageHandler_test.cpp @@ -4,7 +4,7 @@ using sofa::testing::BaseTest ; -////////////// IMPLEMENTS A TEST PREDICATE TO VALIDE THAT A THERE IS AT LEAST ONE MESSAGE +////////////// IMPLEMENTS A TEST PREDICATE TO VALIDATE THAT A THERE IS AT LEAST ONE MESSAGE /// THE IS EMITTED TO VALDIATE THE BEHAVIOR OF THE FRAMEWORK. namespace testing { // Prints a TestPartResult object. (I'm doing this because the 01/03/2018 the operator from gtest @@ -138,7 +138,7 @@ class TestMessageHandler_test : public BaseTest EXPECT_MSG_EMIT(Error) ; msg_warning("HERE") << "This should not generate a failure" ; - msg_error("HERE") << "This should not generate a test falure" ; + msg_error("HERE") << "This should not generate a test failure" ; } /// THIS TEST SHOULD FAIL. @@ -148,7 +148,7 @@ class TestMessageHandler_test : public BaseTest EXPECT_MSG_EMIT(Error) ; //msg_warning("HERE") << "This should not generate a failure" ; - //msg_error("HERE") << "This should not generate a test falure" ; + //msg_error("HERE") << "This should not generate a test failure" ; } void noEmitTestBehavior() @@ -157,7 +157,7 @@ class TestMessageHandler_test : public BaseTest EXPECT_MSG_NOEMIT(Error) ; msg_warning("HERE") << "This should generate a failure but with line number close to " << __LINE__ ; - msg_error("HERE") << "This should generate a test falure with line number close to " << __LINE__ ; + msg_error("HERE") << "This should generate a test failure with line number close to " << __LINE__ ; } void noEmitIgnoredTestBehavior() @@ -193,7 +193,7 @@ class TestMessageHandler_test : public BaseTest EXPECT_MSG_NOEMIT(Error) ; msg_warning("HERE") << "This should generate a failure" ; - msg_error("HERE") << "This should generate a test falure" ; + msg_error("HERE") << "This should generate a test failure" ; } } diff --git a/Sofa/framework/Topology/src/sofa/topology/Triangle.h b/Sofa/framework/Topology/src/sofa/topology/Triangle.h index fcb2c85f3b4..83eec21cf11 100644 --- a/Sofa/framework/Topology/src/sofa/topology/Triangle.h +++ b/Sofa/framework/Topology/src/sofa/topology/Triangle.h @@ -39,7 +39,7 @@ namespace sofa::topology * @tparam Coordinates type representing the coordinates in space (in 3D) * @tparam VectorCoordinates type for the container of coordinates * @param trianglePositions positions of all the points of the triangles set - * @param allTriangles informations about the triangle in the topology (a vector of 3 indices, i.e a triangle) + * @param allTriangles information about the triangle in the topology (a vector of 3 indices, i.e a triangle) * @param shellTriangles triangles around the given point (vector of triangles indices) * @param pointID index of the point (from shellTriangles) from which the algo will try to compute the direction * @param direction direction in which the algo will find a triangle from the pointID diff --git a/Sofa/framework/Type/src/sofa/type/DualQuat.cpp b/Sofa/framework/Type/src/sofa/type/DualQuat.cpp index 784fe827711..a98d8a38b99 100644 --- a/Sofa/framework/Type/src/sofa/type/DualQuat.cpp +++ b/Sofa/framework/Type/src/sofa/type/DualQuat.cpp @@ -27,7 +27,7 @@ namespace sofa::type { -// instanciate the classes +// instantiate the classes template class SOFA_TYPE_API DualQuatCoord3; template class SOFA_TYPE_API DualQuatCoord3; diff --git a/Sofa/framework/Type/src/sofa/type/Frame.h b/Sofa/framework/Type/src/sofa/type/Frame.h index 5944d2378af..cba3bd2bec3 100644 --- a/Sofa/framework/Type/src/sofa/type/Frame.h +++ b/Sofa/framework/Type/src/sofa/type/Frame.h @@ -32,9 +32,9 @@ namespace sofa::type /** The affine transformation of points and vectors from a coordinate system (the local frame) to another (the reference frame). The transformation is not necessarily rigid. -When defined using (origin, rotation, scale), the transfrom can be seen as three frame displacements starting from the reference frame: translation, then rotation along the new origin, then scale along the new axes. Conversely, the projection of a point from the local frame to the reference frame undergoes scaling, then rotation, then translation. Vectors do not undergo translation since they model directions or displacement. +When defined using (origin, rotation, scale), the transform can be seen as three frame displacements starting from the reference frame: translation, then rotation along the new origin, then scale along the new axes. Conversely, the projection of a point from the local frame to the reference frame undergoes scaling, then rotation, then translation. Vectors do not undergo translation since they model directions or displacement. -The product F1F2 can be seen as a frame displacement F1 starting from the reference frame followed by a frame displacement F2 starting from the new frame. It is used in frame hierarchies to model the transfromation frome frame 2 wrt the reference frame. +The product F1F2 can be seen as a frame displacement F1 starting from the reference frame followed by a frame displacement F2 starting from the new frame. It is used in frame hierarchies to model the transformation from frame 2 wrt the reference frame. \author Francois Faure, INRIA-UJF, 2006 */ diff --git a/Sofa/framework/Type/src/sofa/type/Mat.h b/Sofa/framework/Type/src/sofa/type/Mat.h index 4a5ee63ea76..9857a8c9370 100644 --- a/Sofa/framework/Type/src/sofa/type/Mat.h +++ b/Sofa/framework/Type/src/sofa/type/Mat.h @@ -201,7 +201,7 @@ class Mat return L; } - /// number of colums + /// number of columns constexpr Size getNbCols() const { return C; @@ -297,7 +297,7 @@ class Mat return c; } - /// Write acess to line i. + /// Write access to line i. constexpr LineNoInit& operator[](Size i) noexcept { return this->elems[i]; @@ -309,7 +309,7 @@ class Mat return this->elems[i]; } - /// Write acess to line i. + /// Write access to line i. constexpr LineNoInit& operator()(Size i) noexcept { return this->elems[i]; @@ -376,7 +376,7 @@ class Mat /// Special access to second line (read-only). template= 2> > constexpr const Line& y() const noexcept { return this->elems[1]; } - /// Special access to thrid line (read-only). + /// Special access to third line (read-only). template= 3> > constexpr const Line& z() const noexcept { return this->elems[2]; } /// Special access to fourth line (read-only). @@ -616,7 +616,7 @@ class Mat return r; } - /// Substraction with the transposed of the given matrix operator \returns this - mt + /// Subtraction with the transposed of the given matrix operator \returns this - mt constexpr MatminusTransposed(const Mat& m) const noexcept { Mat r(NOINIT); @@ -682,7 +682,7 @@ class Mat (*this)[i][j] += m[j][i]; } - /// Substraction of the transposed of m + /// Subtraction of the transposed of m constexpr void subTransposed(const Mat& m) noexcept { for(Size i=0; i& m) noexcept { for(Size i=0; i } } - /// Substraction assignment operator. + /// Subtraction assignment operator. void operator -=(const MatSym< D,real>& m) { for (sofa::Size i = 0; i < NumberStoredValues; i++) diff --git a/Sofa/framework/Type/src/sofa/type/Mat_solve_SVD.h b/Sofa/framework/Type/src/sofa/type/Mat_solve_SVD.h index 9c0dd4f1277..fcaf33bb3dc 100644 --- a/Sofa/framework/Type/src/sofa/type/Mat_solve_SVD.h +++ b/Sofa/framework/Type/src/sofa/type/Mat_solve_SVD.h @@ -282,7 +282,7 @@ void svddcmp(Mat &a, Vec &w, Mat &v) } } -/// return the condition number of the matrix a following the euclidian norm (using the svd decomposition to find singular values) +/// return the condition number of the matrix a following the euclidean norm (using the svd decomposition to find singular values) template< int m, int n, typename Real> Real cond(Mat &a) { diff --git a/Sofa/framework/Type/src/sofa/type/Quat.cpp b/Sofa/framework/Type/src/sofa/type/Quat.cpp index 9c6d5651816..21980cea2cd 100644 --- a/Sofa/framework/Type/src/sofa/type/Quat.cpp +++ b/Sofa/framework/Type/src/sofa/type/Quat.cpp @@ -26,12 +26,12 @@ namespace sofa::type { -/// Explicit instanciation of the quaternions for double precision +/// Explicit instantiation of the quaternions for double precision template class SOFA_TYPE_API Quat; template SOFA_TYPE_API std::ostream& operator << ( std::ostream& out, const Quat& v ); template SOFA_TYPE_API std::istream& operator >> ( std::istream& in, Quat& v ); -/// Explicit instanciation of the quaternions for single precision +/// Explicit instantiation of the quaternions for single precision template class SOFA_TYPE_API Quat; template SOFA_TYPE_API std::ostream& operator << ( std::ostream& out, const Quat& v ); template SOFA_TYPE_API std::istream& operator >> ( std::istream& in, Quat& v ); diff --git a/Sofa/framework/Type/src/sofa/type/Quat.h b/Sofa/framework/Type/src/sofa/type/Quat.h index 2e0799b0bd5..739fa6e5f59 100644 --- a/Sofa/framework/Type/src/sofa/type/Quat.h +++ b/Sofa/framework/Type/src/sofa/type/Quat.h @@ -214,7 +214,7 @@ class Quat } /// Given two quaternions, add them together to get a third quaternion. - /// Adding quaternions to get a compound rotation is analagous to adding + /// Adding quaternions to get a compound rotation is analogous to adding /// translations to get a compound translation. auto operator+(const Quat &q1) const -> Quat; constexpr auto operator*(const Quat& q1) const -> Quat diff --git a/Sofa/framework/Type/src/sofa/type/SVector.h b/Sofa/framework/Type/src/sofa/type/SVector.h index cd002a7b825..e5d2ba9c8c0 100644 --- a/Sofa/framework/Type/src/sofa/type/SVector.h +++ b/Sofa/framework/Type/src/sofa/type/SVector.h @@ -27,7 +27,7 @@ namespace sofa::type { //====================================================================== -/// Same as type::vector, + delimitors on serialization +/// Same as type::vector, + delimiters on serialization //====================================================================== template class SVector: public type::vector > diff --git a/Sofa/framework/Type/src/sofa/type/Transform.h b/Sofa/framework/Type/src/sofa/type/Transform.h index 6303fbfec65..cb3d779c2ad 100644 --- a/Sofa/framework/Type/src/sofa/type/Transform.h +++ b/Sofa/framework/Type/src/sofa/type/Transform.h @@ -27,7 +27,7 @@ namespace sofa::type { /** - * Define a frame (child) whith respect to another (parent). A frame represents a local coordinate system. + * Define a frame (child) with respect to another (parent). A frame represents a local coordinate system. * * Internal data represents the orientation of the child wrt the parent, BUT the * translation vector represents the origin of the parent with respect to the @@ -35,7 +35,7 @@ namespace sofa::type * coordinates M_c of the same point in child are given by: * M_p = orientation * ( M_c - origin ). This is due to Featherstone's * conventions. Use method setTranslationRotation( const Vec& t, const Rot& q ) - * to model the Transform the standard way (i.e. translation givne in the parent frame). + * to model the Transform the standard way (i.e. translation given in the parent frame). **/ template class Transform diff --git a/Sofa/framework/Type/src/sofa/type/Vec.h b/Sofa/framework/Type/src/sofa/type/Vec.h index 229f30645a9..48e38f038b2 100644 --- a/Sofa/framework/Type/src/sofa/type/Vec.h +++ b/Sofa/framework/Type/src/sofa/type/Vec.h @@ -482,7 +482,7 @@ class Vec /// Use l<0 for the infinite norm. ValueType lNorm( int l ) const { - if( l==2 ) return norm(); // euclidian norm + if( l==2 ) return norm(); // euclidean norm else if( l<0 ) // infinite norm { ValueType n=0; diff --git a/Sofa/framework/Type/src/sofa/type/trait/Rebind.h b/Sofa/framework/Type/src/sofa/type/trait/Rebind.h index a15e8e21678..c462e08a1f4 100644 --- a/Sofa/framework/Type/src/sofa/type/trait/Rebind.h +++ b/Sofa/framework/Type/src/sofa/type/trait/Rebind.h @@ -77,7 +77,7 @@ namespace sofa::type }; /** - * Conveniant alias to ease usage of Rebind. + * Convenient alias to ease usage of Rebind. * * Example: * 1) sofa::type::rebind_to< sofa::type::vector, float> is of type sofa::type::vector. In this example, diff --git a/Sofa/framework/Type/src/sofa/type/vector_Integral.cpp b/Sofa/framework/Type/src/sofa/type/vector_Integral.cpp index e21282786bc..ae183cdddcb 100644 --- a/Sofa/framework/Type/src/sofa/type/vector_Integral.cpp +++ b/Sofa/framework/Type/src/sofa/type/vector_Integral.cpp @@ -87,7 +87,7 @@ SOFA_TYPE_API unsigned int getUnsignedInteger(const std::string& s, std::strings } /// Input stream -/// Specialization for reading vectors of int and unsigned int using "A-B" notation for all integers between A and B, optionnally specifying a step using "A-B-step" notation. +/// Specialization for reading vectors of int and unsigned int using "A-B" notation for all integers between A and B, optionally specifying a step using "A-B-step" notation. template<> SOFA_TYPE_API std::istream& vector::read( std::istream& in ) { diff --git a/Sofa/framework/Type/src/sofa/type/vector_T.h b/Sofa/framework/Type/src/sofa/type/vector_T.h index 182930ffe40..e0ad65b7615 100644 --- a/Sofa/framework/Type/src/sofa/type/vector_T.h +++ b/Sofa/framework/Type/src/sofa/type/vector_T.h @@ -75,7 +75,7 @@ class vector : public std::vector > explicit vector(Size n): std::vector(n) {} /// Constructor vector(const std::vector& x): std::vector(x) {} - /// Brace initalizer constructor + /// Brace initializer constructor vector(const std::initializer_list& t) : std::vector(t) {} /// Move constructor vector(std::vector&& v): std::vector(std::move(v)) {} @@ -154,8 +154,8 @@ class vector : public std::vector > std::fill(this->begin(), this->end(), value); } - /// this function is usefull for vector_device because it resize the vector without device operation (if device is not valid). - /// Therefore the function is used in asynchronous code to safly resize a vector which is either cuda of type::vector + /// this function is useful for vector_device because it resize the vector without device operation (if device is not valid). + /// Therefore the function is used in asynchronous code to safely resize a vector which is either cuda of type::vector void fastResize(Size n) { this->resize(n); diff --git a/Sofa/framework/Type/src/sofa/type/vector_algorithm.h b/Sofa/framework/Type/src/sofa/type/vector_algorithm.h index 10081f4ae48..c8f89aa528b 100644 --- a/Sofa/framework/Type/src/sofa/type/vector_algorithm.h +++ b/Sofa/framework/Type/src/sofa/type/vector_algorithm.h @@ -26,7 +26,7 @@ namespace sofa::type { -/** Remove the first occurence of a given value. +/** Remove the first occurrence of a given value. The remaining values are shifted. */ template @@ -43,7 +43,7 @@ void remove( T1& v, const T2& elem ) v.pop_back(); } -/** Remove the first occurence of a given value. +/** Remove the first occurrence of a given value. The last value is moved to where the value was found, and the other values are not shifted. */ diff --git a/Sofa/framework/Type/src/sofa/type/vector_device.h b/Sofa/framework/Type/src/sofa/type/vector_device.h index 10e0306eed6..a06f9a4f36f 100644 --- a/Sofa/framework/Type/src/sofa/type/vector_device.h +++ b/Sofa/framework/Type/src/sofa/type/vector_device.h @@ -79,10 +79,10 @@ class vector_device #endif mutable Size clearSize; ///< when initializing missing device data, up to where entries should be set to zero ? T* hostPointer; ///< Pointer to the data on the CPU side - mutable int deviceIsValid; ///< True if the data on the GPU is currently valid (up to the given deviceVectorSize of each device, i.e. additionnal space may need to be allocated and/or initialized) + mutable int deviceIsValid; ///< True if the data on the GPU is currently valid (up to the given deviceVectorSize of each device, i.e. additional space may need to be allocated and/or initialized) mutable bool hostIsValid; ///< True if the data on the CPU is currently valid mutable bool bufferIsRegistered; ///< True if the buffer is registered with CUDA - buffer_id_type bufferObject; ///< Optionnal associated buffer ID + buffer_id_type bufferObject; ///< Optional associated buffer ID inline static int cptid = 0; diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.cpp b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.cpp index 1f23d6584ec..a7b0672fd02 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.cpp +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.cpp @@ -117,7 +117,7 @@ void ArticulatedHierarchyBVHController::applyController(void) if (!articulatedObjects.empty()) { // Reference potential initial articulations value for interaction springs - // and Current articulation value at the coresponding artculation + // and Current articulation value at the corresponding artculation std::vector< core::behavior::MechanicalState* >::iterator articulatedObjIt = articulatedObjects.begin(); //std::vector< core::behavior::MechanicalState* >::iterator articulatedObjItEnd = articulatedObjects.end(); diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.h b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.h index 5a86bf1f9dd..cc7446cc874 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.h +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyBVHController.h @@ -77,7 +77,7 @@ class SOFA_ARTICULATEDSYSTEMPLUGIN_API ArticulatedHierarchyBVHController : publi virtual void reset() override; /** - * @brief Apply the controller current modifications to its controled component. + * @brief Apply the controller current modifications to its controlled component. */ virtual void applyController(void) override; diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyContainer.inl b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyContainer.inl index 04f64d4648e..e91f214de6d 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyContainer.inl +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyContainer.inl @@ -249,7 +249,7 @@ void ArticulatedHierarchyContainer::init () } // for Arboris Mapping, init the transformation for each articulation center - type::Quat q; // TODO: add a rotation component to the positionning on the ArticulatedHierarchyContainer + type::Quat q; // TODO: add a rotation component to the positioning on the ArticulatedHierarchyContainer (*ac)->H_p_pLc.set((*ac)->posOnParent.getValue(),q); (*ac)->H_c_cLp.set((*ac)->posOnChild.getValue(), q); (*ac)->H_pLc_cLp.identity(); diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.cpp b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.cpp index 113c2ae7547..2542e59290e 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.cpp +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.cpp @@ -188,7 +188,7 @@ void ArticulatedHierarchyController::dumpActiveArticulations(void) const void ArticulatedHierarchyController::dumpArticulationsAndBindingKeys(void) const { - msg_info() << "ARTICULATIONS_KEYBOARD_CONTROLER : Controled Articulations & Binding Keys" ; + msg_info() << "ARTICULATIONS_KEYBOARD_CONTROLER : Controlled Articulations & Binding Keys" ; auto articulationsIndicesIt = articulationsIndices.getValue().cbegin(); const auto articulationsIndicesItEnd = articulationsIndices.getValue().cend(); @@ -373,7 +373,7 @@ void ArticulatedHierarchyController::applyController(void) if (!articulatedObjects.empty()) { // Reference potential initial articulations value for interaction springs - // and Current articulation value at the coresponding artculation + // and Current articulation value at the corresponding artculation std::vector< MechanicalState* >::iterator articulatedObjIt = articulatedObjects.begin(); // std::vector< MechanicalState* >::iterator articulatedObjItEnd = articulatedObjects.end(); diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.h b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.h index 80b9098a122..1e3d3c899a4 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.h +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedHierarchyController.h @@ -103,7 +103,7 @@ class SOFA_ARTICULATEDSYSTEMPLUGIN_API ArticulatedHierarchyController : public C //@} /** - * @brief Apply the controller current modifications to its controled component. + * @brief Apply the controller current modifications to its controlled component. */ virtual void applyController(void); diff --git a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedSystemMapping.inl b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedSystemMapping.inl index 2d6d3a62521..548e028a9fd 100644 --- a/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedSystemMapping.inl +++ b/applications/plugins/ArticulatedSystemPlugin/src/ArticulatedSystemPlugin/ArticulatedSystemMapping.inl @@ -210,7 +210,7 @@ void ArticulatedSystemMapping::apply( typename Out::VecCoord case 0: // 0-(default) articulation are treated one by one, the axis of the second articulation is updated by the potential rotation of the first articulation // potential problems could arise when rotation exceed 90? (known problem of euler angles) { - // the position of the child is reset to its rest position (based on the postion of the articulation center) + // the position of the child is reset to its rest position (based on the position of the articulation center) out[child].getOrientation() = out[parent].getOrientation(); out[child].getCenter() = out[parent].getCenter() + (*ac)->initTranslateChild(out[parent].getOrientation()); @@ -275,7 +275,7 @@ void ArticulatedSystemMapping::apply( typename Out::VecCoord // step 1: compute the new position of the articulation center and the articulation pos - // rq: the articulation center folows the translations + // rq: the articulation center follows the translations (*ac)->globalPosition.setValue(out[parent].getCenter() + out[parent].getOrientation().rotate((*ac)->posOnParent.getValue()) + (*ac)->DisplacementArticulationCenter); type::vector< sofa::component::container::Articulation* >::const_iterator a = articulations.begin(); diff --git a/applications/plugins/BulletCollisionDetection/BulletCollisionDetection.dox b/applications/plugins/BulletCollisionDetection/BulletCollisionDetection.dox index 748a6501638..7335ebb4220 100644 --- a/applications/plugins/BulletCollisionDetection/BulletCollisionDetection.dox +++ b/applications/plugins/BulletCollisionDetection/BulletCollisionDetection.dox @@ -5,7 +5,7 @@ BulletCollisionDetection, where broad phase and narrow phase are performed. So in the Sofa scene, you must place the element BulletCollisionDetection instead of any broad or narrow phase. An important thing to know is that this plugin works well with constraints (LMConstraintSolver for example) and no with -penality contacts because it is not robust to collision models penetration. But +penalty contacts because it is not robust to collision models penetration. But some improvement has been done with the collision model margin to allow this for most of the primitives (if the primitives don't penetrate). diff --git a/applications/plugins/BulletCollisionDetection/BulletCollisionDetection_test/BCD_test.cpp b/applications/plugins/BulletCollisionDetection/BulletCollisionDetection_test/BCD_test.cpp index 2d700693bc5..a747ecf240b 100644 --- a/applications/plugins/BulletCollisionDetection/BulletCollisionDetection_test/BCD_test.cpp +++ b/applications/plugins/BulletCollisionDetection/BulletCollisionDetection_test/BCD_test.cpp @@ -71,7 +71,7 @@ sofa::component::collision::BulletOBBCollisionModel & dvelocities = *obbDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -85,7 +85,7 @@ sofa::component::collision::BulletOBBCollisionModel::SPtr obbCollisionModel = New(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel //obbCollisionModel->init(); obbCollisionModel->resize(1); @@ -148,7 +148,7 @@ struct copyBulletOBB{ sofa::component::collision::BulletOBBCollisionModel::SPtr obbCollisionModel = New(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel //obbCollisionModel->init(); obbCollisionModel->resize(1); @@ -191,7 +191,7 @@ struct copyBulletConvexHull{ sofa::component::collision::BulletConvexHullModel::SPtr cv_hull_model = New(); obb->addObject(cv_hull_model); - //editting the OBBModel + //editing the OBBModel //obbCollisionModel->init(); cv_hull_model->resize(1); @@ -244,7 +244,7 @@ struct copyBulletConvexHull{ // sofa::component::collision::OBBCollisionModel::SPtr obbCollisionModel = New(); // obb->addObject(obbCollisionModel); -// //editting the OBBModel +// //editing the OBBModel // //obbCollisionModel->init(); // obbCollisionModel->resize(1); diff --git a/applications/plugins/BulletCollisionDetection/doc/Doxyfile b/applications/plugins/BulletCollisionDetection/doc/Doxyfile index 12a07965972..9c980bf83ae 100644 --- a/applications/plugins/BulletCollisionDetection/doc/Doxyfile +++ b/applications/plugins/BulletCollisionDetection/doc/Doxyfile @@ -954,7 +954,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/applications/plugins/BulletCollisionDetection/examples/GlobalBulletCollision.py b/applications/plugins/BulletCollisionDetection/examples/GlobalBulletCollision.py index a2914792e0b..414c94dfd7d 100644 --- a/applications/plugins/BulletCollisionDetection/examples/GlobalBulletCollision.py +++ b/applications/plugins/BulletCollisionDetection/examples/GlobalBulletCollision.py @@ -4,13 +4,13 @@ from cmath import * ############################################################################################ -# following defs are optionnal entry points, called by the PythonScriptController component; +# following defs are optional entry points, called by the PythonScriptController component; ############################################################################################ class GlobalCollision(Sofa.PythonScriptController): - # optionnally, script can create a graph... + # optionally, script can create a graph... def createGraph(self,node): node.findData('dt').value=0.05 diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h index cfbc311c61f..3508e5afe32 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCollisionDetection.h @@ -145,7 +145,7 @@ class SOFA_BULLETCOLLISIONDETECTION_API BulletIntersection : public core::collis addCollisionDetection(); addCollisionDetection(); - //if you want to take account of one of any intersection below, uncoment it, + //if you want to take account of one of any intersection below, uncomment it, //I wrote it because order is important for the collision response addCollisionDetection(); addCollisionDetection(); diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h index 0919373525e..d5336d1f9b7 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.h @@ -143,7 +143,7 @@ class TBulletConvexHullModel : public sofa::core::CollisionModel ,public BulletC Data CHPoints; ///< points defining the convex hull Data computeNormals; ///< set to false to disable computation of triangles normal Data positionDefined; ///< set to true if the collision model position is defined in the mechanical object - Data concavityThreeshold; ///< Threeshold used in the decomposition + Data concavityThreeshold; ///< Threshold used in the decomposition protected: void draw_without_decomposition(const core::visual::VisualParams* vparams); void draw_decomposition(const core::visual::VisualParams* vparams); diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl index 8b45d6fcb28..36664f9fd67 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletConvexHullModel.inl @@ -22,7 +22,7 @@ TBulletConvexHullModel::TBulletConvexHullModel() , CHPoints(initData(&CHPoints,"CHPoints", "points defining the convex hull")) , computeNormals(initData(&computeNormals, true, "computeNormals", "set to false to disable computation of triangles normal")) , positionDefined(initData(&positionDefined,false,"positionDefined","set to true if the collision model position is defined in the mechanical object" )) - , concavityThreeshold(initData(&concavityThreeshold, (SReal)100, "concavityThreeshold","Threeshold used in the decomposition")) + , concavityThreeshold(initData(&concavityThreeshold, (SReal)100, "concavityThreeshold","Threshold used in the decomposition")) , _mstate(NULL) { bmsh = 0x0; diff --git a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCylinderModel.h b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCylinderModel.h index 09b35efd5aa..9d21fd9804f 100644 --- a/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCylinderModel.h +++ b/applications/plugins/BulletCollisionDetection/src/BulletCollisionDetection/BulletCylinderModel.h @@ -9,7 +9,7 @@ #include //WARNING : if you want to take account of intersections involving BulletCylinderModel, -//uncoment code in BulletCollisionDetection.h beggining at line 173 +//uncomment code in BulletCollisionDetection.h beginning at line 173 namespace sofa { @@ -75,7 +75,7 @@ class TBulletCylinderModel : public sofa::component::collision::geometry::Cylind typedef TBulletCylinderModel BulletCylinderModel; #if !defined(SOFA_BUILD_BULLETCOLLISIONDETECTION) -extern template class SOFA_BULLETCOLLISIONDETECTION_API TBulletCylinderModel;//je pense que les cylindres sont définis sur des rigides dans bullet +extern template class SOFA_BULLETCOLLISIONDETECTION_API TBulletCylinderModel;//je pense que les cylinders sont définis sur des rigides dans bullet #endif diff --git a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBBCapsPrimitiveCreator.h b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBBCapsPrimitiveCreator.h index c72403d1092..b2e77106dc3 100644 --- a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBBCapsPrimitiveCreator.h +++ b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBBCapsPrimitiveCreator.h @@ -85,7 +85,7 @@ inline collisionobbcapsule::geometry::OBBCollisionModel & dvelocities = *obbDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -99,7 +99,7 @@ inline collisionobbcapsule::geometry::OBBCollisionModel::SPtr obbCollisionModel = New>(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel obbCollisionModel->init(); Data::VecCoord> & dVecCoord = obbCollisionModel->writeExtents(); collisionobbcapsule::geometry::OBBCollisionModel::VecCoord & vecCoord = *(dVecCoord.beginEdit()); @@ -131,7 +131,7 @@ inline collisionobbcapsule::geometry::CapsuleCollisionModel& dvelocities = *capDOF->write(sofa::core::VecId::velocity()); MechanicalObject3::VecDeriv& velocities = *dvelocities.beginEdit(); @@ -151,7 +151,7 @@ inline collisionobbcapsule::geometry::CapsuleCollisionModeladdObject(capCollisionModel); - //editting the OBBModel + //editing the OBBModel capCollisionModel->init(); Data::VecReal>& dVecReal = capCollisionModel->writeRadii(); collisionobbcapsule::geometry::CapsuleCollisionModel::VecReal& vecReal = *(dVecReal.beginEdit()); diff --git a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp index 5060d0b87ea..d9f86ddaee8 100644 --- a/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp +++ b/applications/plugins/CollisionOBBCapsule/CollisionOBBCapsule_test/OBB_test.cpp @@ -103,7 +103,7 @@ sofa::component::collision::geometry::SphereCollisionModel & dvelocities = *sphDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -117,7 +117,7 @@ sofa::component::collision::geometry::SphereCollisionModeladdObject(sphCollisionModel); - //editting the OBBModel + //editing the OBBModel sphCollisionModel->init(); Data::VecReal> & dVecReal = sphCollisionModel->d_radius; sofa::component::collision::geometry::SphereCollisionModel::VecReal & vecReal = *(dVecReal.beginEdit()); @@ -549,7 +549,7 @@ bool TestCapOBB::edgeVertex(){ return true; } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::edgeEdge(){ //first, we create the transformation to make the first OBB double angles[3]; @@ -598,7 +598,7 @@ bool TestCapOBB::edgeEdge(){ } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::vertexEdge(){ //first, we create the transformation to make the first OBB double angles[3]; @@ -646,7 +646,7 @@ bool TestCapOBB::vertexEdge(){ } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::vertexVertex(){ //first, we create the transformation to make the first OBB double angles[3]; diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h index e0902efbd36..6d96a8faca7 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/BaseIntTool.h @@ -38,7 +38,7 @@ class COLLISIONOBBCAPSULE_API BaseIntTool : public CapsuleIntTool,public OBBIntT template static bool testIntersection(Elem1&,Elem2&,SReal){ - msg_info("BaseIntTool")<<"testIntersection should not be used with theese types"; + msg_info("BaseIntTool")<<"testIntersection should not be used with these types"; return false; } @@ -90,8 +90,8 @@ class COLLISIONOBBCAPSULE_API BaseIntTool : public CapsuleIntTool,public OBBIntT return CapsuleIntTool::computeIntersection(cap,sph,alarmDist,contactDist,contacts); } - template - inline static int computeIntersection(geometry::TCapsule &cap, geometry::OBB & obb, SReal alarmDist, SReal contactDist, OutputVector *contacts){ + template + inline static int computeIntersection(geometry::TCapsule &cap, geometry::OBB & obb, SReal alarmDist, SReal contactDist, OutputVector *contacts){ return CapsuleIntTool::computeIntersection(cap,obb,alarmDist,contactDist,contacts); } diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.inl b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.inl index 6281f227ec0..ee0c0731933 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.inl +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/CapsuleIntTool.inl @@ -76,13 +76,13 @@ int CapsuleIntTool::computeIntersection(geometry::TCapsule & e1,geom } else{//Capsule segments on a same plane. Here the idea to find the nearest points //is to project segment apexes on the other segment. - //Visual example with semgents AB and CD : + //Visual example with segments AB and CD : // A----------------B // C----------------D //After projection : // A--------c-------B // C-------b--------D - //So the nearest points are p and q which are respecively in the middle of cB and Cb: + //So the nearest points are p and q which are respectively in the middle of cB and Cb: // A--------c---p---B // C---q---b--------D diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrUtility3.inl b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrUtility3.inl index 9401bb490ec..ea29d78d0be 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrUtility3.inl +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/IntrUtility3.inl @@ -202,7 +202,7 @@ void IntrConfigManager >::init (const type::Vec<3,Rea // 7 +++ // // When it returns an ordering in the IntrConfiguration, it is also - // guarenteed to be in-order (if 4 vertices, then they are guarenteed in + // guaranteed to be in-order (if 4 vertices, then they are guaranteed in // an order that will create a box, e.g. 0,1,3,2). Real axes[3] = @@ -830,13 +830,13 @@ void IntrUtil::segNearestPoints(const type::Vec<3,Real> & p0,const type::V } else{//segment segments on a same plane. Here the idea to find the nearest points //is to project segment apexes on the other segment. - //Visual example with semgents AB and CD : + //Visual example with segments AB and CD : // A----------------B // C----------------D //After projection : // A--------c-------B // C-------b--------D - //So the nearest points are p and q which are respecively in the middle of cB and Cb: + //So the nearest points are p and q which are respectively in the middle of cB and Cb: // A--------c---p---B // C---q---b--------D type::Vec<3,Real> AD = q1 - p0; diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.cpp b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.cpp index af0c5dd1ecb..5e457390a19 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.cpp +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.cpp @@ -75,13 +75,13 @@ int MeshIntTool::doCapLineInt(const type::Vec3 & p1,const type::Vec3 & p2,SReal } else{//Segments on a same plane. Here the idea to find the nearest points //is to project segment apexes on the other segment. - //Visual example with semgents AB and CD : + //Visual example with segments AB and CD : // A----------------B // C----------------D //After projection : // A--------c-------B // C-------b--------D - //So the nearest points are p and q which are respecively in the middle of cB and Cb: + //So the nearest points are p and q which are respectively in the middle of cB and Cb: // A--------c---p---B // C---q---b--------D @@ -289,7 +289,7 @@ int MeshIntTool::doIntersectionTrianglePoint(SReal dist2, int flags, const type: detection->value = detection->normal.norm(); detection->normal /= detection->value; - ///!\ CAUTION : uninitialized fields detection->elem and detection->id and detection->value, you have to substract contactDist + ///!\ CAUTION : uninitialized fields detection->elem and detection->id and detection->value, you have to subtract contactDist return 1; } diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h index 77ea1d9c9d2..73777b81564 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/detection/intersection/MeshIntTool.h @@ -66,7 +66,7 @@ class COLLISIONOBBCAPSULE_API MeshIntTool static int doCapLineInt(const type::Vec3 & p1,const type::Vec3 & p2,SReal cap_rad, const type::Vec3 & q1, const type::Vec3 & q2,SReal alarmDist,SReal contactDist,OutputVector* contacts,bool ignore_p1 = false,bool ignore_p2 = false); - ////!\ CAUTION : uninitialized fields detection->elem and detection->id and detection->value, you have to substract contactDist, because + ////!\ CAUTION : uninitialized fields detection->elem and detection->id and detection->value, you have to subtract contactDist, because ///this function can be used also as doIntersectionTriangleSphere where the contactDist = getContactDist() + sphere_radius static int doIntersectionTrianglePoint(SReal dist2, int flags, const type::Vec3& p1, const type::Vec3& p2, const type::Vec3& p3,const type::Vec3& q, OutputVector* contacts,bool swapElems = false); diff --git a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h index c226ba7cd82..d78206b9846 100644 --- a/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h +++ b/applications/plugins/CollisionOBBCapsule/src/CollisionOBBCapsule/geometry/OBBModel.h @@ -37,7 +37,7 @@ class OBBCollisionModel; /** *An OBB model is a set of OBBs. It is linked to a rigid mechanical object. Each frame - *of the rigid machanical object represents the frame of one OBB. So an OBB is represented + *of the rigid mechanical object represents the frame of one OBB. So an OBB is represented *by its frame which orients it, a center and 3 extents. *A point P is inside the OBB obb if and only if P = obb.center() + a*obb.axis(0) + b*obb.axis(1) + c*obb.axis(2) *with -obb.extent(0) <= a <= obb.extent(0), -obb.extent(1) <= b <= obb.extent(1), -obb.extent(2) <= c <= obb.extent(2). diff --git a/applications/plugins/DiffusionSolver/DiffusionSolver.h b/applications/plugins/DiffusionSolver/DiffusionSolver.h index a8531ffd38c..90731ff52db 100644 --- a/applications/plugins/DiffusionSolver/DiffusionSolver.h +++ b/applications/plugins/DiffusionSolver/DiffusionSolver.h @@ -8,7 +8,7 @@ /** Solving diffusion on 3D regular grids (stored as CImg) * @param size (in) the size of the regular domain in the 3 directions. * @param img (in-out) the image to diffuse. It contains the Dirichlet boundary values and contains warm-start values (must be set to 0 for no warm-start). - * @param mask (in) represents the type of each voxel. A negative value represents the exterior of the domain, a positive value for the interior and 0 for Dirichlet boundary conditions. The boundary exterior/interior implicitely represents a Neumann boundary condition imposing null gradients along normals. + * @param mask (in) represents the type of each voxel. A negative value represents the exterior of the domain, a positive value for the interior and 0 for Dirichlet boundary conditions. The boundary exterior/interior implicitly represents a Neumann boundary condition imposing null gradients along normals. * * @warning the material map must be normalized between [0,1] * @warning at least a one pixel outside border diff --git a/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.cpp b/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.cpp index dd54d354a3d..6b9483eebd4 100644 --- a/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.cpp +++ b/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.cpp @@ -166,7 +166,7 @@ GeomagicDriver::GeomagicDriver() , d_frameVisu(initData(&d_frameVisu, false, "drawDeviceFrame", "Visualize the frame corresponding to the device tooltip")) , d_omniVisu(initData(&d_omniVisu, false, "drawDevice", "Visualize the Geomagic device in the virtual scene")) , d_posDevice(initData(&d_posDevice, "positionDevice", "position of the base of the part of the device")) - , d_angle(initData(&d_angle, "angle", "Angluar values of joint (rad)")) + , d_angle(initData(&d_angle, "angle", "Angular values of joint (rad)")) , d_button_1(initData(&d_button_1,"button1","Button state 1")) , d_button_2(initData(&d_button_2,"button2","Button state 2")) , l_forceFeedback(initLink("forceFeedBack", "link to the forceFeedBack component, if not set will search through graph and take first one encountered.")) diff --git a/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.h b/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.h index e61a9f66804..373a2d8520e 100644 --- a/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.h +++ b/applications/plugins/Geomagic/src/Geomagic/GeomagicDriver.h @@ -84,7 +84,7 @@ class SOFA_GEOMAGIC_API GeomagicDriver : public Controller /// Public method to init tool. Can be called from thirdparty if @sa d_manualStart is set to true virtual void initDevice(); - /// Method to clear sheduler and free device. Called by default at driver destruction + /// Method to clear scheduler and free device. Called by default at driver destruction virtual void clearDevice(); @@ -117,7 +117,7 @@ class SOFA_GEOMAGIC_API GeomagicDriver : public Controller //Output Data Data d_posDevice; ///< position of the base of the part of the device - Data d_angle; ///< Angluar values of joint (rad) + Data d_angle; ///< Angular values of joint (rad) Data d_button_1; ///< Button state 1 Data d_button_2; ///< Button state 2 diff --git a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h index 20bdb925e37..1a8fa11bc3f 100644 --- a/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h +++ b/applications/plugins/Geomagic/src/Geomagic/GeomagicEmulator.h @@ -68,7 +68,7 @@ class SOFA_GEOMAGIC_API GeomagicEmulator : public GeomagicDriver /// Public method to init tool. Can be called from thirdparty if @sa d_manualStart is set to true virtual void initDevice() override; - /// Method to clear sheduler and free device. Called by default at driver destruction + /// Method to clear scheduler and free device. Called by default at driver destruction virtual void clearDevice() override; diff --git a/applications/plugins/Haption/CMakeLists.txt b/applications/plugins/Haption/CMakeLists.txt index 766031f9480..e3db3247644 100644 --- a/applications/plugins/Haption/CMakeLists.txt +++ b/applications/plugins/Haption/CMakeLists.txt @@ -41,4 +41,4 @@ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -install(DIRECTORY exemple/ DESTINATION share/sofa/plugins/${PROJECT_NAME}) +install(DIRECTORY examples/ DESTINATION share/sofa/plugins/${PROJECT_NAME}) diff --git a/applications/plugins/Haption/exemple/haption1.scn b/applications/plugins/Haption/examples/haption1.scn similarity index 100% rename from applications/plugins/Haption/exemple/haption1.scn rename to applications/plugins/Haption/examples/haption1.scn diff --git a/applications/plugins/Haption/exemple/temp1.scn b/applications/plugins/Haption/examples/temp1.scn similarity index 100% rename from applications/plugins/Haption/exemple/temp1.scn rename to applications/plugins/Haption/examples/temp1.scn diff --git a/applications/plugins/Haption/initHaption.cpp b/applications/plugins/Haption/initHaption.cpp index b26a579a6a4..d8a8505ba51 100644 --- a/applications/plugins/Haption/initHaption.cpp +++ b/applications/plugins/Haption/initHaption.cpp @@ -75,7 +75,7 @@ const char* getModuleVersion() const char* getModuleDescription() { - return "Force feedback with sensable devices into SOFA Framework"; + return "Force feedback with sensible devices into SOFA Framework"; } const char* getModuleComponentList() diff --git a/applications/plugins/LeapMotion/LeapMotion/Leap.h b/applications/plugins/LeapMotion/LeapMotion/Leap.h index fb20cc19303..a9d9d3fedbb 100644 --- a/applications/plugins/LeapMotion/LeapMotion/Leap.h +++ b/applications/plugins/LeapMotion/LeapMotion/Leap.h @@ -1205,7 +1205,7 @@ class CircleGesture : public Gesture * The ScreenTapGesture class represents a tapping gesture by a finger or tool. * * A screen tap gesture is recognized when the tip of a finger pokes forward - * and then springs back to approximately the original postion, as if + * and then springs back to approximately the original position, as if * tapping a vertical screen. The tapping finger must pause briefly before beginning the tap. * * \image html images/Leap_Gesture_Tap2.png @@ -1276,7 +1276,7 @@ class ScreenTapGesture : public Gesture LEAP_EXPORT Vector direction() const; /** - * The progess value is always 1.0 for a screen tap gesture. + * The progress value is always 1.0 for a screen tap gesture. * * @returns float The value 1.0. */ @@ -1294,7 +1294,7 @@ class ScreenTapGesture : public Gesture * The KeyTapGesture class represents a tapping gesture by a finger or tool. * * A key tap gesture is recognized when the tip of a finger rotates down toward the - * palm and then springs back to approximately the original postion, as if + * palm and then springs back to approximately the original position, as if * tapping. The tapping finger must pause briefly before beginning the tap. * * \image html images/Leap_Gesture_Tap.png @@ -1367,7 +1367,7 @@ class KeyTapGesture : public Gesture LEAP_EXPORT Vector direction() const; /** - * The progess value is always 1.0 for a key tap gesture. + * The progress value is always 1.0 for a key tap gesture. * * @returns float The value 1.0. */ @@ -1800,21 +1800,21 @@ class PointableList : public Interface { LEAP_EXPORT Pointable operator[](int index) const; /** - * Appends the members of the specifed PointableList to this PointableList. + * Appends the members of the specified PointableList to this PointableList. * @param other A PointableList object containing Pointable objects * to append to the end of this PointableList. */ LEAP_EXPORT PointableList& append(const PointableList& other); /** - * Appends the members of the specifed FingerList to this PointableList. + * Appends the members of the specified FingerList to this PointableList. * @param other A FingerList object containing Finger objects * to append to the end of this PointableList. */ LEAP_EXPORT PointableList& append(const FingerList& other); /** - * Appends the members of the specifed ToolList to this PointableList. + * Appends the members of the specified ToolList to this PointableList. * @param other A ToolList object containing Tool objects * to append to the end of this PointableList. */ @@ -1894,7 +1894,7 @@ class FingerList : public Interface { LEAP_EXPORT Finger operator[](int index) const; /** - * Appends the members of the specifed FingerList to this FingerList. + * Appends the members of the specified FingerList to this FingerList. * @param other A FingerList object containing Finger objects * to append to the end of this FingerList. */ @@ -1973,7 +1973,7 @@ class ToolList : public Interface { LEAP_EXPORT Tool operator[](int index) const; /** - * Appends the members of the specifed ToolList to this ToolList. + * Appends the members of the specified ToolList to this ToolList. * @param other A ToolList object containing Tool objects * to append to the end of this ToolList. */ @@ -2052,7 +2052,7 @@ class HandList : public Interface { LEAP_EXPORT Hand operator[](int index) const; /** - * Appends the members of the specifed HandList to this HandList. + * Appends the members of the specified HandList to this HandList. * @param other A HandList object containing Hand objects * to append to the end of this HandList. */ @@ -2445,13 +2445,13 @@ class Frame : public Interface { LEAP_EXPORT GestureList gestures() const; /** - * Returns a GestureList containing all gestures that have occured since + * Returns a GestureList containing all gestures that have occurred since * the specified frame. * * @param sinceFrame An earlier Frame object. The starting frame must * still be in the frame history cache, which has a default length of * 60 frames. - * @return GestureList The list of the Gesture objects that have occured + * @return GestureList The list of the Gesture objects that have occurred * since the specified frame. */ LEAP_EXPORT GestureList gestures(const Frame& sinceFrame) const; @@ -2699,7 +2699,7 @@ class Frame : public Interface { * * After setting a configuration value, you must call the Config::save method * to commit the changes. The configuration value changes are not persistent; - * your application needs to set the values everytime it runs. + * your application needs to set the values every time it runs. * * @see CircleGesture * @see KeyTapGesture @@ -2771,7 +2771,7 @@ class Config : public Interface { * Call ``save()`` after making a set of configuration changes. The * ``save()`` function transfers the configuration changes to the Leap * application. The configuration value changes are not persistent; your - * application needs to set the values everytime it runs. + * application needs to set the values every time it runs. * * @returns true on success, false on failure. */ diff --git a/applications/plugins/LeapMotion/LeapMotion/LeapMath.h b/applications/plugins/LeapMotion/LeapMotion/LeapMath.h index e99a3e7c9a2..e84ec8eff95 100644 --- a/applications/plugins/LeapMotion/LeapMotion/LeapMath.h +++ b/applications/plugins/LeapMotion/LeapMotion/LeapMath.h @@ -580,7 +580,7 @@ struct Matrix * transformations (translations and rotations). If the matrix is not rigid, * this operation will not represent an inverse. * - * Note that all matricies that are directly returned by the API are rigid. + * Note that all matrices that are directly returned by the API are rigid. * * @returns The rigid inverse of the matrix. */ diff --git a/applications/plugins/LeapMotion/src/LeapMotionDriver.cpp b/applications/plugins/LeapMotion/src/LeapMotionDriver.cpp index 143229ce4ab..ae337e36c7a 100644 --- a/applications/plugins/LeapMotion/src/LeapMotionDriver.cpp +++ b/applications/plugins/LeapMotion/src/LeapMotionDriver.cpp @@ -40,7 +40,7 @@ namespace controller #define SCROLL_DIRECTION_THRESHOLD 0.5 #define SWIPE_MIN_VELOCITY 500 #define SWIPE_MAX_VELOCITY 6000 -#define PINCH_DISTANCE_THRESHOLD 40 // a pinch will be detected if the distance between two fingers is smaller than this thresold +#define PINCH_DISTANCE_THRESHOLD 40 // a pinch will be detected if the distance between two fingers is smaller than this threshold #define PINCH_DOTPRODUCT_THRESHOLD 0.8 int32_t fingersIdsArray[5] = {-1,-1,-1,-1,-1}; @@ -55,7 +55,7 @@ LeapMotionDriver::LeapMotionDriver() , gestureType(initData(&gestureType, int(-1) ,"gestureType","Type of the current gesture detected by the Leap Motion")) , gesturePosition(initData(&gesturePosition, "gesturePosition","Position of the current gesture detected by the Leap Motion")) , gestureDirection(initData(&gestureDirection, "gestureDirection","Direction of the current gesture detected by the Leap Motion")) - , scrollDirection(initData (&scrollDirection, int(0), "scrollDirection", "Enter 0 if no scrolling (1 if scoll increases the value, 2 if scroll decreases it)")) + , scrollDirection(initData (&scrollDirection, int(0), "scrollDirection", "Enter 0 if no scrolling (1 if scroll increases the value, 2 if scroll decreases it)")) , displayHand(initData (&displayHand, false, "displayHand", "display the hand detected by the Leap Motion")) { this->f_listening.setValue(true); diff --git a/applications/plugins/LeapMotion/src/LeapMotionDriver.h b/applications/plugins/LeapMotion/src/LeapMotionDriver.h index f76372793fe..8dd8d7edc9b 100644 --- a/applications/plugins/LeapMotion/src/LeapMotionDriver.h +++ b/applications/plugins/LeapMotion/src/LeapMotionDriver.h @@ -89,7 +89,7 @@ class LeapMotionDriver : public sofa::component::controller::Controller Data< int > gestureType; ///< Type of the current gesture detected by the Leap Motion Data< Vec3d > gesturePosition; ///< Position of the current gesture detected by the Leap Motion Data< Vec3d > gestureDirection; ///< Direction of the current gesture detected by the Leap Motion - Data< int > scrollDirection; ///< Enter 0 if no scrolling (1 if scoll increases the value, 2 if scroll decreases it) + Data< int > scrollDirection; ///< Enter 0 if no scrolling (1 if scroll increases the value, 2 if scroll decreases it) Data< bool > displayHand; ///< display the hand detected by the Leap Motion Data< double > speed; diff --git a/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h b/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h index 3ea20ac8771..f4ae5bf94c6 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h +++ b/applications/plugins/MultiThreading/src/MultiThreading/CollisionAnimationLoop_mt.h @@ -60,7 +60,7 @@ using namespace sofa; * This class can optionally replace the default computation scheme of computing * collisions then doing an integration step. * - * Note that it is in a preliminary stage, hence its fonctionnalities and API will + * Note that it is in a preliminary stage, hence its functionalities and API will * certainly change soon. * */ diff --git a/applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBruteForceBroadPhase.h b/applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBruteForceBroadPhase.h index 39de048fda9..6d3206c22dc 100644 --- a/applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBruteForceBroadPhase.h +++ b/applications/plugins/MultiThreading/src/MultiThreading/component/collision/detection/algorithm/ParallelBruteForceBroadPhase.h @@ -90,7 +90,7 @@ class SOFA_MULTITHREADING_PLUGIN_API BruteForcePairTest : public sofa::simulatio private: - /// Begining of a range of pairs of collision models to tests in this task + /// Beginning of a range of pairs of collision models to tests in this task PairIterator m_first; /// End of a range of pairs of collision models to tests in this task PairIterator m_last; diff --git a/applications/plugins/PersistentContact/PersistentFrictionContact.inl b/applications/plugins/PersistentContact/PersistentFrictionContact.inl index 18f1294f785..a6a8401c3f4 100644 --- a/applications/plugins/PersistentContact/PersistentFrictionContact.inl +++ b/applications/plugins/PersistentContact/PersistentFrictionContact.inl @@ -489,7 +489,7 @@ void PersistentFrictionContact::activateConst if (this->selfCollision && use_mapper_for_state1 != use_mapper_for_state2) { this->f_printLog.setValue(true); - serr << "Problem : selfColision but not same targetting state => constraint not created" << sendl; + serr << "Problem : selfColision but not same targeting state => constraint not created" << sendl; return; } diff --git a/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl b/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl index 8f3a258ccdf..6c731b70c0c 100644 --- a/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl +++ b/applications/plugins/PersistentContact/PersistentUnilateralInteractionConstraint.inl @@ -236,7 +236,7 @@ void PersistentUnilateralInteractionConstraint::getPositionViolation( v->set(c.id, dfree); - c.dfree = dfree; // PJ : For isActive() method. Don't know if it's still usefull. + c.dfree = dfree; // PJ : For isActive() method. Don't know if it's still useful. if (c.mu > 0.0) { diff --git a/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp b/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp index c53d67db33b..e1519db54d7 100644 --- a/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp +++ b/applications/plugins/SceneCreator/src/SceneCreator/SceneCreator.cpp @@ -378,7 +378,7 @@ simulation::Node::SPtr addCube(simulation::Node::SPtr parent, const std::string& const Deriv3& translation, const Deriv3 &rotation, const Deriv3 &scale) { //TODO(dmarchal): It is unclear to me if this message should be a msg_ (for end user) - // or dmsg_ for developpers. + // or dmsg_ for developers. if (parent == nullptr){ msg_warning("SceneCreator") << "Parent node is nullptr. Returning Null Pointer." ; return nullptr; @@ -449,7 +449,7 @@ simulation::Node::SPtr addCylinder(simulation::Node::SPtr parent, const std::str const Deriv3& translation, const Deriv3 &rotation, const Deriv3 &scale) { //TODO(dmarchal): It is unclear to me if this message should be a msg_ (for end user) - // or dmsg_ for developpers. + // or dmsg_ for developers. if (parent == nullptr){ msg_warning("SceneCreator") << "Warning: parent node is nullptr. Returning Null Pointer." ; return nullptr; @@ -513,7 +513,7 @@ simulation::Node::SPtr addSphere(simulation::Node::SPtr parent, const std::strin const Deriv3& translation, const Deriv3 &rotation, const Deriv3 &scale) { //TODO(dmarchal): It is unclear to me if this message should be a msg_ (for end user) - // or dmsg_ for developpers. + // or dmsg_ for developers. if (parent == nullptr){ msg_warning("SceneCreator") << "Warning: parent node is nullptr. Returning Null Pointer." ; return nullptr; @@ -573,7 +573,7 @@ simulation::Node::SPtr addPlane(simulation::Node::SPtr parent, const std::string const Deriv3& translation, const Deriv3 &rotation, const Deriv3 &scale) { //TODO(dmarchal): It is unclear to me if this message should be a msg_ (for end user) - // or dmsg_ for developpers. + // or dmsg_ for developers. if (parent == nullptr){ msg_warning("SceneCreator") << " Parent node is nullptr. Returning Null Pointer." ; return nullptr; diff --git a/applications/plugins/Sensable/NewOmniDriver.cpp b/applications/plugins/Sensable/NewOmniDriver.cpp index 7bd587ea2a6..ded4863fabb 100644 --- a/applications/plugins/Sensable/NewOmniDriver.cpp +++ b/applications/plugins/Sensable/NewOmniDriver.cpp @@ -123,7 +123,7 @@ HDCallbackCode HDCALLBACK stateCallback(void * userData) //vector autreOmniDriver = static_cast>(userData); //NewOmniData* data = static_cast(userData); - //FIXME : Apparenlty, this callback is run before the mechanical state initialisation. I've found no way to know whether the mechcanical state is initialized or not, so i wait ... + //FIXME : Apparently, this callback is run before the mechanical state initialisation. I've found no way to know whether the mechcanical state is initialized or not, so i wait ... RigidTypes::VecCoord positionDevs; RigidTypes::VecDeriv forceDevs; diff --git a/applications/plugins/Sensable/OmniDriver.cpp b/applications/plugins/Sensable/OmniDriver.cpp index 38fa65f080e..df38dd2f33a 100644 --- a/applications/plugins/Sensable/OmniDriver.cpp +++ b/applications/plugins/Sensable/OmniDriver.cpp @@ -112,7 +112,7 @@ HDCallbackCode HDCALLBACK stateCallbackOmni(void *userData) //cout << "OmniDriver::stateCallback BEGIN" << endl; OmniData* data = static_cast(userData); - //FIXME : Apparenlty, this callback is run before the mechanical state initialisation. I've found no way to know whether the mechcanical state is initialized or not, so i wait ... + //FIXME : Apparently, this callback is run before the mechanical state initialisation. I've found no way to know whether the mechcanical state is initialized or not, so i wait ... //static int wait = 0; if (data->servoDeviceData.stop) diff --git a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_06.scn b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_06.scn index 234c4da54c2..aa3d3c290a1 100644 --- a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_06.scn +++ b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_06.scn @@ -3,7 +3,7 @@ Using LCP contact detection and resolution: + Added a driver for the Omni phantom device + Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation + Added a computation (LCPForceFeedback) of the haptic forces - + Added VectorSpringForceField && JointSpringForceField to link the mouvements of the Omni phantom and the instrument + + Added VectorSpringForceField && JointSpringForceField to link the movements of the Omni phantom and the instrument --> diff --git a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_07.scn b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_07.scn index 10c9a4bf9ea..664a1f4eaac 100644 --- a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_07.scn +++ b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_07.scn @@ -3,7 +3,7 @@ Using LCP contact detection and resolution: + Added a driver for the Omni phantom device + Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation + Added a computation (LCPForceFeedback) of the haptic forces - + Added VectorSpringForceField && JointSpringForceField to link the mouvements of the Omni phantom and the instrument + + Added VectorSpringForceField && JointSpringForceField to link the movements of the Omni phantom and the instrument --> diff --git a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_08.scn b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_08.scn index b7778b3dccb..b806d15d543 100644 --- a/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_08.scn +++ b/applications/plugins/Sensable/examples/Dentistry/dentalSurgery_08.scn @@ -3,7 +3,7 @@ Using LCP contact detection and resolution: + Added a driver for the Omni phantom device + Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation + Added a computation (LCPForceFeedback) of the haptic forces - + Added VectorSpringForceField && JointSpringForceField to link the mouvements of the Omni phantom and the instrument + + Added VectorSpringForceField && JointSpringForceField to link the movements of the Omni phantom and the instrument --> diff --git a/applications/plugins/SofaAssimp/AssimpLoader.cpp b/applications/plugins/SofaAssimp/AssimpLoader.cpp index d292f93d631..f4a8451708d 100644 --- a/applications/plugins/SofaAssimp/AssimpLoader.cpp +++ b/applications/plugins/SofaAssimp/AssimpLoader.cpp @@ -94,7 +94,7 @@ bool AssimpLoader::doLoad() // And have it read the given file with some example postprocessing // Usually - if speed is not the most important aspect for you - you'll - // propably to request more postprocessing than we do in this example. + // probably to request more postprocessing than we do in this example. m_assimpScene = (aiScene*)aiImportFile(filename, pp_Loadsteps); /* aiProcess_CalcTangentSpace | aiProcess_Triangulate | diff --git a/applications/plugins/SofaAssimp/initAssimpPlugin.cpp b/applications/plugins/SofaAssimp/initAssimpPlugin.cpp index 99d2bd3ae55..b6ab7c865c7 100644 --- a/applications/plugins/SofaAssimp/initAssimpPlugin.cpp +++ b/applications/plugins/SofaAssimp/initAssimpPlugin.cpp @@ -66,7 +66,7 @@ const char* getModuleLicense() const char* getModuleDescription() { - return "Use Assimp reader and write functionnalities into SOFA"; + return "Use Assimp reader and write functionalities into SOFA"; } const char* getModuleComponentList() diff --git a/applications/plugins/SofaCUDA/CMakeLists.txt b/applications/plugins/SofaCUDA/CMakeLists.txt index 343aa18e187..9ec20b48eda 100644 --- a/applications/plugins/SofaCUDA/CMakeLists.txt +++ b/applications/plugins/SofaCUDA/CMakeLists.txt @@ -230,7 +230,7 @@ set(CUDA_SOURCES sofa_find_package(Sofa.GL QUIET) if(NOT Sofa.GL_FOUND) message(WARNING "Sofa.GL is not active.") - message("OpenGL-related code wont be enabled (Sharing OpenGL buffers with CUDA)") + message("OpenGL-related code won't be enabled (Sharing OpenGL buffers with CUDA)") else() list(APPEND HEADER_FILES sofa/gpu/cuda/CudaVisualModel.h diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaHexahedronTLEDForceField.cu b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaHexahedronTLEDForceField.cu index 368d7741204..4d89ca12e59 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaHexahedronTLEDForceField.cu +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaHexahedronTLEDForceField.cu @@ -150,7 +150,7 @@ __global__ void CudaHexahedronTLEDForceField3f_calcForce_kernel0( /** - * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symetric) + * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symmetric) */ float C11, C12, C13, C22, C23, C33; C11 = XT[0][0]*XT[0][0] + XT[0][1]*XT[0][1] + XT[0][2]*XT[0][2]; @@ -329,7 +329,7 @@ __global__ void CudaHexahedronTLEDForceField3f_calcForce_kernel1( /** - * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symetric) + * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symmetric) */ float C11, C12, C13, C22, C23, C33; C11 = XT[0][0]*XT[0][0] + XT[0][1]*XT[0][1] + XT[0][2]*XT[0][2]; @@ -515,7 +515,7 @@ __global__ void CudaHexahedronTLEDForceField3f_calcForce_kernel2( /** - * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symetric) + * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symmetric) */ float C11, C12, C13, C22, C23, C33; C11 = XT[0][0]*XT[0][0] + XT[0][1]*XT[0][1] + XT[0][2]*XT[0][2]; @@ -740,7 +740,7 @@ __global__ void CudaHexahedronTLEDForceField3f_calcForce_kernel3( /** - * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symetric) + * Computes the right Cauchy-Green deformation tensor C = XT*X (in fact we compute only 6 terms since C is symmetric) */ float C11, C12, C13, C22, C23, C33; C11 = XT[0][0]*XT[0][0] + XT[0][1]*XT[0][1] + XT[0][2]*XT[0][2]; diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaMatrix.h b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaMatrix.h index 17ccf738a85..8fb6f13c6fe 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaMatrix.h +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaMatrix.h @@ -147,7 +147,7 @@ class CudaMatrix const size_t oldpitch_host = pitch_host; pitch_host = d_x * sizeof(T);// new pitch_host larger than oldpitch_host : guarantee that data on the host are continuous - mycudaMallocPitch(&devicePointer, &pitch_device, d_x*sizeof(T), allocSizeY);// new pitch_device biger than oldpitch_device + mycudaMallocPitch(&devicePointer, &pitch_device, d_x*sizeof(T), allocSizeY);// new pitch_device bigger than oldpitch_device MemoryManager::hostAlloc( (void **) &hostPointer, pitch_host*allocSizeY); if (sizeX!=0 && sizeY!=0) { diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTetrahedronTLEDForceField.cpp b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTetrahedronTLEDForceField.cpp index d63d2968e7c..98bb227321c 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTetrahedronTLEDForceField.cpp +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTetrahedronTLEDForceField.cpp @@ -191,7 +191,7 @@ void CudaTetrahedronTLEDForceField::reinit() } } - // Tesselation of each cube into 6 tetrahedra + // Tessellation of each cube into 6 tetrahedra inputElems.reserve(nbcubes*6); for (int i=0; i= 3 diff --git a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaVisualModel.h b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaVisualModel.h index 357d55f9ee2..916b9718454 100644 --- a/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaVisualModel.h +++ b/applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaVisualModel.h @@ -77,7 +77,7 @@ class CudaVisualModel : public core::visual::VisualModel int nbElement; ///< number of elements int nbVertex; ///< number of vertices to process to compute all elements int nbElementPerVertex; ///< max number of elements connected to a vertex - /// Index of elements attached to each points (layout per bloc of NBLOC vertices, with first element of each vertex, then second element, etc) + /// Index of elements attached to each points (layout per block of NBLOC vertices, with first element of each vertex, then second element, etc) gpu::cuda::CudaVector velems; Data matAmbient; ///< material ambient color @@ -132,9 +132,9 @@ class CudaVisualModel : public core::visual::VisualModel void setV(int vertex, int num, int index) { - const int bloc = vertex/BSIZE; + const int block = vertex/BSIZE; const int b_x = vertex%BSIZE; - velems[ bloc*BSIZE*nbElementPerVertex // start of the bloc + velems[ block*BSIZE*nbElementPerVertex // start of the block + num*BSIZE // offset to the element + b_x // offset to the vertex ] = index+1; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/response/contact/CudaPenalityContactForceField.inl b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/response/contact/CudaPenalityContactForceField.inl index 6042beabb6e..8f2ef0afc67 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/response/contact/CudaPenalityContactForceField.inl +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/response/contact/CudaPenalityContactForceField.inl @@ -179,7 +179,7 @@ void PenalityContactForceField::addDForce(const core::Mechanical Coord du = dx2[i]-dx1[i]; Coord norm(c[0],c[1],c[2]); Real dpen = - du*norm; - //if (c.pen < 0) dpen += c.pen; // start penality at distance 0 + //if (c.pen < 0) dpen += c.pen; // start penalty at distance 0 //Real dfN = c.ks * dpen; Deriv dforce = -norm*(dpen*kFactor); //dfN; df1[i]+=dforce; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f.cpp index 78039dbf244..4ec1b36e0ad 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f.cpp @@ -250,7 +250,7 @@ void BarycentricMapperMeshTopology::resize( core: //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// -// Spread the instanciations over multiple files for more efficient and lightweight compilation +// Spread the instantiations over multiple files for more efficient and lightweight compilation // Instantiations involving only CudaVec3fTypes template class SOFA_GPU_CUDA_API BarycentricMapping< CudaVec3fTypes, CudaVec3fTypes>; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-3f.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-3f.cpp index 62549453c1f..3622e7a752d 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-3f.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-3f.cpp @@ -408,9 +408,9 @@ void BarycentricMapperMeshTopology::resize( core //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// -// Spread the instanciations over multiple files for more efficient and lightweight compilation +// Spread the instantiations over multiple files for more efficient and lightweight compilation -// instanciations involving CudaVec3f1Types with CudaVec3fTypes +// instantiations involving CudaVec3f1Types with CudaVec3fTypes template class SOFA_GPU_CUDA_API BarycentricMapping< CudaVec3f1Types, CudaVec3fTypes>; template class SOFA_GPU_CUDA_API BarycentricMapping< CudaVec3fTypes, CudaVec3f1Types>; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-d.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-d.cpp index aab64d19366..4ff9260c226 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-d.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-d.cpp @@ -32,9 +32,9 @@ using namespace sofa::core; using namespace sofa::core::behavior; using namespace sofa::gpu::cuda; -// Spread the instanciations over multiple files for more efficient and lightweight compilation +// Spread the instantiations over multiple files for more efficient and lightweight compilation -// instanciations involving both CudaVec3f1Types and Vec3dTypes +// instantiations involving both CudaVec3f1Types and Vec3dTypes diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-f.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-f.cpp index 5cd861a0b7c..61862e6bdad 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-f.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1-f.cpp @@ -36,9 +36,9 @@ using namespace sofa::core; using namespace sofa::core::behavior; using namespace sofa::gpu::cuda; -// Spread the instanciations over multiple files for more efficient and lightweight compilation +// Spread the instantiations over multiple files for more efficient and lightweight compilation -// instanciations involving both CudaVec3f1Types and Vec3fTypes +// instantiations involving both CudaVec3f1Types and Vec3fTypes } // namespace component::mapping diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1.cpp index fea6f7e1bd4..c411530e6d4 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-3f1.cpp @@ -225,9 +225,9 @@ void BarycentricMapperMeshTopology::resize( cor //////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////// -// Spread the instanciations over multiple files for more efficient and lightweight compilation +// Spread the instantiations over multiple files for more efficient and lightweight compilation -// instanciations involving only CudaVec3f1Types with CudaVec3f1Types +// instantiations involving only CudaVec3f1Types with CudaVec3f1Types template class SOFA_GPU_CUDA_API BarycentricMapping< CudaVec3f1Types, CudaVec3f1Types>; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-f.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-f.cpp index 044cd32411c..62f78160fa3 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-f.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping-f.cpp @@ -37,7 +37,7 @@ using namespace sofa::core::behavior; using namespace sofa::gpu::cuda; -// Spread the instanciations over multiple files for more efficient and lightweight compilation. See CudaBarycentricMapping-*.cpp files. +// Spread the instantiations over multiple files for more efficient and lightweight compilation. See CudaBarycentricMapping-*.cpp files. // Instantiations involving both CudaVec3fTypes and Vec3fTypes diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.cpp b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.cpp index 7cd2cf9c3d7..39d994729b7 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.cpp +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.cpp @@ -33,7 +33,7 @@ using namespace sofa::core::behavior; using namespace sofa::gpu::cuda; -// Spread the instanciations over multiple files for more efficient and lightweight compilation. See CudaBarycentricMapping-*.cpp files. +// Spread the instantiations over multiple files for more efficient and lightweight compilation. See CudaBarycentricMapping-*.cpp files. // Instantiations involving both CudaVec3fTypes and Vec3dTypes template class SOFA_GPU_CUDA_API BarycentricMapping< Vec3Types, CudaVec3Types>; diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.inl b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.inl index c5895413dfd..8e5026922ac 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.inl +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaBarycentricMapping.inl @@ -162,7 +162,7 @@ void BarycentricMapperRegularGridTopology maxNOut) maxNOut = nout[i]; const int nbloc = (insize+BSIZE-1)/BSIZE; - msg_info() << "CudaBarycentricMapping: mapT with "< addPointInCube(index-c0, coefs.ptr()); } } - msg_info() << "CUDA: BarycentricMapperMeshTopology: map initialized, "< for (Index i=0; i maxNOut) maxNOut = nout[i]; const int nbloc = (insize+BSIZE-1)/BSIZE; - msg_info() << "CudaBarycentricMapping: mapT with "< velems; @@ -217,9 +217,9 @@ class HexahedronFEMForceFieldInternalData< gpu::cuda::CudaVectorTypes springs; ///< springs attached to each points (layout per bloc of NBLOC vertices, with first spring of each vertex, then second spring, etc) + gpu::cuda::CudaVector springs; ///< springs attached to each points (layout per block of NBLOC vertices, with first spring of each vertex, then second spring, etc) gpu::cuda::CudaVector dfdx; GPUSpringSet() : vertex0(0), nbVertex(0), nbSpringPerVertex(0) {} void init(int v0, int nbv, int nbsperv) @@ -102,13 +102,13 @@ namespace sofa::component::solidmechanics::spring } void set(int vertex, int spring, int index, float initpos, float ks, float kd) { - const int bloc = vertex / BSIZE; + const int block = vertex / BSIZE; const int b_x = vertex % BSIZE; - springs[2 * bloc * BSIZE * nbSpringPerVertex // start of the bloc + springs[2 * block * BSIZE * nbSpringPerVertex // start of the block + 2 * spring * BSIZE // offset to the spring + b_x // offset to the vertex ].set(index, initpos, ks, kd); - (*(GPUSpring2*)&(springs[2 * bloc * BSIZE * nbSpringPerVertex // start of the bloc + (*(GPUSpring2*)&(springs[2 * block * BSIZE * nbSpringPerVertex // start of the block + 2 * spring * BSIZE // offset to the spring + b_x + BSIZE // offset to the vertex ])).set(index, initpos, ks, kd); diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.cu b/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.cu index 4562b1cb829..6790785bbe3 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.cu +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.cu @@ -2255,7 +2255,7 @@ void MechanicalObjectCudaVec1f_vDot(unsigned int size, float* res, const void* a if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -2294,7 +2294,7 @@ void MechanicalObjectCudaVec2f_vDot(unsigned int size, float* res, const void* a if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -2339,7 +2339,7 @@ void MechanicalObjectCudaVec3f_vDot(unsigned int size, float* res, const void* a if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -2384,7 +2384,7 @@ void MechanicalObjectCudaVec3f1_vDot(unsigned int size, float* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -2429,7 +2429,7 @@ void MechanicalObjectCudaVec6f_vDot(unsigned int size, float* res, const void* a if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -2474,7 +2474,7 @@ void MechanicalObjectCudaRigid3f_vDot(unsigned int size, float* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(float) >>>(size, (float*)tmp, (const float*)a, (const float*)b); if (nblocs == 1) { @@ -3071,7 +3071,7 @@ void MechanicalObjectCudaVec2d_vDot(unsigned int size, double* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(double) >>>(size, (double*)tmp, (const double*)a, (const double*)b); if (nblocs == 1) { @@ -3116,7 +3116,7 @@ void MechanicalObjectCudaVec3d_vDot(unsigned int size, double* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(double) >>>(size, (double*)tmp, (const double*)a, (const double*)b); if (nblocs == 1) { @@ -3161,7 +3161,7 @@ void MechanicalObjectCudaVec3d1_vDot(unsigned int size, double* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(double) >>>(size, (double*)tmp, (const double*)a, (const double*)b); if (nblocs == 1) { @@ -3206,7 +3206,7 @@ void MechanicalObjectCudaVec6d_vDot(unsigned int size, double* res, const void* if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(double) >>>(size, (double*)tmp, (const double*)a, (const double*)b); if (nblocs == 1) { @@ -3251,7 +3251,7 @@ void MechanicalObjectCudaRigid3d_vDot(unsigned int size, double* res, const void if (nblocs > 256) nblocs = 256; dim3 threads(RED_BSIZE,1); dim3 grid(nblocs,1); - //myprintf("size=%d, blocs=%dx%d\n",size,nblocs,RED_BSIZE); + //myprintf("size=%d, blocks=%dx%d\n",size,nblocs,RED_BSIZE); MechanicalObjectCudaVec_vDot_kernel /**/ <<< grid, threads , RED_BSIZE * sizeof(double) >>>(size, (double*)tmp, (const double*)a, (const double*)b); if (nblocs == 1) { diff --git a/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.inl b/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.inl index 7caa05432e3..ddb03b7d716 100644 --- a/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.inl +++ b/applications/plugins/SofaCUDA/src/SofaCUDA/component/statecontainer/CudaMechanicalObject.inl @@ -1322,7 +1322,7 @@ void MechanicalObjectInternalData< gpu::cuda::CudaVectorTypeswrite(core::VecCoordId(ops[0].first.getId(m)))->endEdit() : m->write(core::VecDerivId(ops[0].first.getId(m)))->endEdit(); } - // optimize the solve for MCNAB sovler + // optimize the solve for MCNAB solver // 1) x += v*dt // 2) prevReac=reac // 3) prevDiff=diff diff --git a/applications/plugins/SofaDistanceGrid/applications/meshconv/tesselate.cpp b/applications/plugins/SofaDistanceGrid/applications/meshconv/tesselate.cpp index af338aa83b1..3b74aa71eb7 100644 --- a/applications/plugins/SofaDistanceGrid/applications/meshconv/tesselate.cpp +++ b/applications/plugins/SofaDistanceGrid/applications/meshconv/tesselate.cpp @@ -88,7 +88,7 @@ void tesselateMesh(Mesh& obj, int rec=1, bool onSphere=false) for (int r=0; r,L> return c; } - /// Write acess to line i. + /// Write access to line i. Line& operator[](int i) { return this->elems[i]; @@ -142,7 +142,7 @@ class Mat : public fixed_array,L> return this->elems[i]; } - /// Write acess to line i. + /// Write access to line i. Line& operator()(int i) { return this->elems[i]; @@ -203,7 +203,7 @@ class Mat : public fixed_array,L> const Line& x() const { static_assert(L >= 1, ""); return this->elems[0]; } /// Special access to second line (read-only). const Line& y() const { static_assert(L >= 2, ""); return this->elems[1]; } - /// Special access to thrid line (read-only). + /// Special access to third line (read-only). const Line& z() const { static_assert(L >= 3, ""); return this->elems[2]; } /// Special access to fourth line (read-only). const Line& w() const { static_assert(L >= 4, ""); return this->elems[3]; } @@ -557,7 +557,7 @@ Mat4x4f matrixTransform(const Vec3f& pos, const Vec3f& scale); Mat4x4f matrixTransform(const Vec3f& pos, float scale); Mat4x4f matrixTransform(const Vec3f& pos); -// Assignement from typed data +// Assignment from typed data namespace Type { diff --git a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/include/ftl/quat.h b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/include/ftl/quat.h index eec6f3dc068..24ccea1b7af 100644 --- a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/include/ftl/quat.h +++ b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/include/ftl/quat.h @@ -86,7 +86,7 @@ class Quat }; -// Assignement from typed data +// Assignment from typed data namespace Type { diff --git a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/ftlm/quat.cpp b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/ftlm/quat.cpp index e2d8a7ee75f..c56e697051f 100644 --- a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/ftlm/quat.cpp +++ b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/ftlm/quat.cpp @@ -280,7 +280,7 @@ bool Quat::isIdentity() const return w>=1.0f; } -// Assignement from typed data +// Assignment from typed data namespace Type { diff --git a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/librender/mesh_io_obj.cpp b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/librender/mesh_io_obj.cpp index af92ba64bf9..630491bbf4b 100644 --- a/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/librender/mesh_io_obj.cpp +++ b/applications/plugins/SofaDistanceGrid/extlibs/miniFlowVR/src/librender/mesh_io_obj.cpp @@ -222,7 +222,7 @@ class MeshObjData mat.shininess = (float)strtod(skip(c),(char**)&c); } else if (t == "Tf") - { // transmisssion filter + { // transmission filter mat.alpha = readColor(c)[0]; } else if (t == "d") diff --git a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/DistanceGrid.h b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/DistanceGrid.h index d011c6c8f21..a003e79d812 100644 --- a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/DistanceGrid.h +++ b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/DistanceGrid.h @@ -37,7 +37,7 @@ namespace sofa::helper::io ////// DistanceGrid declaration namespace sofa { -//todo(dmarchal) I see no reason why this is into component as DistanceGrid obvisouly isn't one +//todo(dmarchal) I see no reason why this is into component as DistanceGrid obviously isn't one // can someone suggest a refactoring to have things in the right location. namespace component { diff --git a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/collision/RigidDistanceGridDiscreteIntersection.cpp b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/collision/RigidDistanceGridDiscreteIntersection.cpp index 9848302edb8..066e9bb8f45 100644 --- a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/collision/RigidDistanceGridDiscreteIntersection.cpp +++ b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/collision/RigidDistanceGridDiscreteIntersection.cpp @@ -399,7 +399,7 @@ int RigidDistanceGridDiscreteIntersection::computeIntersection(RigidDistanceGrid #if 0 // -rotationT*translation is the position of cube2 center in cube1 space // we use its largest component as the dominant contact face normal - /// \TODO use the relative velocity as an additionnal factor + /// \TODO use the relative velocity as an additional factor type::Vec3 normal = rotation.multTranspose(-translation); //normal[2] *= 1.1f; // we like Z contact better ;) if (rabs(normal[0]) > rabs(normal[1])) diff --git a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/forcefield/DistanceGridForceField.h b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/forcefield/DistanceGridForceField.h index 5c16e45ea92..ab1ceadead0 100644 --- a/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/forcefield/DistanceGridForceField.h +++ b/applications/plugins/SofaDistanceGrid/src/SofaDistanceGrid/components/forcefield/DistanceGridForceField.h @@ -38,7 +38,7 @@ namespace component namespace forcefield { -/// This class can be overridden if needed for additionnal storage within template specializations. +/// This class can be overridden if needed for additional storage within template specializations. template class DistanceGridForceFieldInternalData { @@ -166,7 +166,7 @@ class DistanceGridForceField : public core::behavior::ForceField Data drawPoints; ///< enable/disable drawing of distancegrid Data drawSize; ///< display size if draw is enabled - /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning) + /// optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning) Data< type::Vec<2,int> > localRange; protected: DistanceGridForceField() @@ -189,7 +189,7 @@ class DistanceGridForceField : public core::behavior::ForceField , bDraw(initData(&bDraw, false, "draw", "enable/disable drawing of distancegrid")) , drawPoints(initData(&drawPoints, false, "drawPoints", "enable/disable drawing of distancegrid")) , drawSize(initData(&drawSize, (Real)10.0f, "drawSize", "display size if draw is enabled")) - , localRange( initData(&localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitionning)" ) ) + , localRange( initData(&localRange, type::Vec<2,int>(-1,-1), "localRange", "optional range of local DOF indices. Any computation involving only indices outside of this range are discarded (useful for parallelization using mesh partitioning)" ) ) { this->addAlias(&stiffnessIn,"stiffness"); this->addAlias(&stiffnessOut,"stiffness"); diff --git a/applications/plugins/SofaHAPI/doc/Doxyfile b/applications/plugins/SofaHAPI/doc/Doxyfile index a5b7d03580c..2b6957fe895 100644 --- a/applications/plugins/SofaHAPI/doc/Doxyfile +++ b/applications/plugins/SofaHAPI/doc/Doxyfile @@ -289,10 +289,10 @@ TYPEDEF_HIDES_STRUCT = NO # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h index 5234a16f206..948cb9f820c 100644 --- a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h +++ b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/BroadPhase_test.h @@ -162,7 +162,7 @@ void randMoving(sofa::core::CollisionModel* cm,const Vector3 & min_vect,const Ve Data & dpositions = *dof->write( sofa::core::VecId::position() ); MechanicalObjectRigid3::VecCoord & positions = *dpositions.beginEdit(); - //Editting the velocity of the OBB + //Editing the velocity of the OBB Data & dvelocities = *dof->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -417,7 +417,7 @@ sofa::component::collision::OBBCollisionModel::S dpositions.endEdit(); - //Editting the velocity of the OBB + //Editing the velocity of the OBB Data & dvelocities = *obbDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -432,7 +432,7 @@ sofa::component::collision::OBBCollisionModel::S sofa::component::collision::OBBCollisionModel::SPtr obbCollisionModel = New >(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel sofa::component::collision::OBBCollisionModel::Real & def_ext = *(obbCollisionModel->default_ext.beginEdit()); def_ext = default_extent; diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBBCapsPrimitiveCreator.h b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBBCapsPrimitiveCreator.h index 5c7590a809e..d704f48b952 100644 --- a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBBCapsPrimitiveCreator.h +++ b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBBCapsPrimitiveCreator.h @@ -84,7 +84,7 @@ inline sofa::component::collision::OBBCollisionModel & dvelocities = *obbDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -98,7 +98,7 @@ inline sofa::component::collision::OBBCollisionModel::SPtr obbCollisionModel = New>(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel obbCollisionModel->init(); Data::VecCoord> & dVecCoord = obbCollisionModel->writeExtents(); sofa::component::collision::OBBCollisionModel::VecCoord & vecCoord = *(dVecCoord.beginEdit()); @@ -130,7 +130,7 @@ inline sofa::component::collision::CapsuleCollisionModel& dvelocities = *capDOF->write(sofa::core::VecId::velocity()); MechanicalObject3::VecDeriv& velocities = *dvelocities.beginEdit(); @@ -150,7 +150,7 @@ inline sofa::component::collision::CapsuleCollisionModeladdObject(capCollisionModel); - //editting the OBBModel + //editing the OBBModel capCollisionModel->init(); Data::VecReal>& dVecReal = capCollisionModel->writeRadii(); sofa::component::collision::CapsuleCollisionModel::VecReal& vecReal = *(dVecReal.beginEdit()); diff --git a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp index f3adc0e9e4e..a6abe0204f6 100644 --- a/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp +++ b/applications/plugins/SofaMiscCollision/SofaMiscCollision_test/OBB_test.cpp @@ -104,7 +104,7 @@ sofa::component::collision::SphereCollisionModel dpositions.endEdit(); - //Editting the velocity of the Sphere + //Editing the velocity of the Sphere Data & dvelocities = *sphDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -118,7 +118,7 @@ sofa::component::collision::SphereCollisionModel sph->addObject(sphCollisionModel); - //editting the OBBModel + //editing the OBBModel sphCollisionModel->init(); Data::VecReal> & dVecReal = sphCollisionModel->radius; sofa::component::collision::SphereCollisionModel::VecReal & vecReal = *(dVecReal.beginEdit()); @@ -550,7 +550,7 @@ bool TestCapOBB::edgeVertex(){ return true; } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::edgeEdge(){ //first, we create the transformation to make the first OBB double angles[3]; @@ -599,7 +599,7 @@ bool TestCapOBB::edgeEdge(){ } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::vertexEdge(){ //first, we create the transformation to make the first OBB double angles[3]; @@ -647,7 +647,7 @@ bool TestCapOBB::vertexEdge(){ } -//obb's edge 6-5 in intersection parallely with the capsule +//obb's edge 6-5 in intersection parallelly with the capsule bool TestCapOBB::vertexVertex(){ //first, we create the transformation to make the first OBB double angles[3]; diff --git a/applications/plugins/SofaNewmat/examples/MatrixContributions121.scn b/applications/plugins/SofaNewmat/examples/MatrixContributions121.scn index 0531b6a07f9..b9cab087713 100644 --- a/applications/plugins/SofaNewmat/examples/MatrixContributions121.scn +++ b/applications/plugins/SofaNewmat/examples/MatrixContributions121.scn @@ -1,6 +1,6 @@ diff --git a/applications/plugins/SofaOpenCL/OpenCLProgramParser.h b/applications/plugins/SofaOpenCL/OpenCLProgramParser.h index 7e9f4e70d68..9207fefad14 100644 --- a/applications/plugins/SofaOpenCL/OpenCLProgramParser.h +++ b/applications/plugins/SofaOpenCL/OpenCLProgramParser.h @@ -54,15 +54,15 @@ class OpenCLProgramParser _program=*program; } - // find args used by the fonction + // find args used by the function void parseFonction(std::string name = "__OP__") { - //find the name of the fonction + //find the name of the function int begin = _operation.find(name); begin = _operation.find("(",begin+name.size()); int end = _operation.find(")",begin); - //find args of the fonction + //find args of the function int i,n; int j=begin; while(begin<=j && j " << (*it).second << std::endl;*/ } - // find args used by the program for fonction + // find args used by the program for function void parseProgram(int beginParser, int &beginFunction, int &endFunction,std::string name = "__OP__") { - //find the fonction + //find the function beginFunction = _program.find(name,beginParser); int beginArg = _program.find("(",beginFunction); endFunction = _program.find(")",beginFunction); - //find args of the fonction + //find args of the function int i,n; int j=beginArg; std::map::iterator it=_map.begin(); diff --git a/applications/plugins/SofaOpenCL/OpenCLSpringForceField.h b/applications/plugins/SofaOpenCL/OpenCLSpringForceField.h index 568837f18a5..52a91ddfa34 100644 --- a/applications/plugins/SofaOpenCL/OpenCLSpringForceField.h +++ b/applications/plugins/SofaOpenCL/OpenCLSpringForceField.h @@ -103,7 +103,7 @@ class SpringForceFieldInternalData< gpu::opencl::OpenCLVectorTypes springs; ///< springs attached to each points (layout per bloc of NBLOC vertices, with first spring of each vertex, then second spring, etc) + gpu::opencl::OpenCLVector springs; ///< springs attached to each points (layout per block of NBLOC vertices, with first spring of each vertex, then second spring, etc) gpu::opencl::OpenCLVector dfdx; ///< only used for StiffSpringForceField GPUSpringSet() : vertex0(0), nbVertex(0), nbSpringPerVertex(0) {} void init(int v0, int nbv, int nbsperv) @@ -116,13 +116,13 @@ class SpringForceFieldInternalData< gpu::opencl::OpenCLVectorTypes & dpositions = *dof->write( sofa::core::VecId::position() ); MechanicalObjectRigid3::VecCoord & positions = *dpositions.beginEdit(); - //Editting the velocity of the OBB + //Editing the velocity of the OBB sofa::core::objectmodel::Data & dvelocities = *dof->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -403,7 +403,7 @@ sofa::component::collision::OBBCollisionModel::S dpositions.endEdit(); - //Editting the velocity of the OBB + //Editing the velocity of the OBB sofa::core::objectmodel::Data & dvelocities = *obbDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -418,7 +418,7 @@ sofa::component::collision::OBBCollisionModel::S sofa::component::collision::OBBCollisionModel::SPtr obbCollisionModel = sofa::core::objectmodel::New >(); obb->addObject(obbCollisionModel); - //editting the OBBModel + //editing the OBBModel sofa::component::collision::OBBCollisionModel::Real & def_ext = *(obbCollisionModel->default_ext.beginEdit()); def_ext = default_extent; diff --git a/applications/plugins/SofaTest/ForceField_test.h b/applications/plugins/SofaTest/ForceField_test.h index 1c4f1ff8246..14d0012dee2 100644 --- a/applications/plugins/SofaTest/ForceField_test.h +++ b/applications/plugins/SofaTest/ForceField_test.h @@ -48,7 +48,7 @@ namespace sofa { /** @brief Helper for writing ForceField tests. - * The constructor creates a root node and adds it a State and a ForceField (of the paremeter type of this template class). + * The constructor creates a root node and adds it a State and a ForceField (of the parameter type of this template class). * Pointers to node, state and force are available. * Deriving the ForceField test from this class makes it easy to write: just call function run_test with positions, velocities and the corresponding expected forces. * This function automatically checks not only the forces (function addForce), but also the stiffness (methods addDForce and addKToMatrix), using finite differences. @@ -79,7 +79,7 @@ struct ForceField_test : public Sofa_test Test entirely written in python diff --git a/applications/plugins/SofaTest/Mapping_test.h b/applications/plugins/SofaTest/Mapping_test.h index 9e3fbb6b799..507283e179f 100644 --- a/applications/plugins/SofaTest/Mapping_test.h +++ b/applications/plugins/SofaTest/Mapping_test.h @@ -112,8 +112,8 @@ struct Mapping_test: public Sofa_test simulation::Node::SPtr root; ///< Root of the scene graph, created by the constructor an re-used in the tests simulation::Simulation* simulation; ///< created by the constructor an re-used in the tests std::pair deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is perturbation * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than errorMax * numeric_limits::epsilon - Real errorFactorDJ; ///< The test for geometric stiffness is successfull if the (infinite norm of the) difference is less than errorFactorDJ * errorMax * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than errorMax * numeric_limits::epsilon + Real errorFactorDJ; ///< The test for geometric stiffness is successful if the (infinite norm of the) difference is less than errorFactorDJ * errorMax * numeric_limits::epsilon static const unsigned char TEST_getJs = 1; ///< testing getJs used in assembly API @@ -167,7 +167,7 @@ struct Mapping_test: public Sofa_test } - /** Returns OutCoord substraction a-b */ + /** Returns OutCoord subtraction a-b */ virtual OutDeriv difference( const OutCoord& a, const OutCoord& b ) { return Out::coordDifference(a,b); diff --git a/applications/plugins/SofaTest/Multi2Mapping_test.h b/applications/plugins/SofaTest/Multi2Mapping_test.h index 861a8786b79..8964cec245e 100644 --- a/applications/plugins/SofaTest/Multi2Mapping_test.h +++ b/applications/plugins/SofaTest/Multi2Mapping_test.h @@ -110,7 +110,7 @@ struct Multi2Mapping_test : public Sofa_test simulation::Node::SPtr parentsIn1, parentsIn2; ///< Parent nodes, created by setupScene simulation::Simulation* simulation; ///< created by the constructor an re-used in the tests std::pair deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is deltaRange * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon /// Constructor @@ -126,7 +126,7 @@ struct Multi2Mapping_test : public Sofa_test sofa::simulation::getSimulation()->unload(root); } - /** Returns OutCoord substraction a-b (should return a OutDeriv, but???) + /** Returns OutCoord subtraction a-b (should return a OutDeriv, but???) */ OutDeriv difference(const OutCoord& c1, const OutCoord& c2) { @@ -163,7 +163,7 @@ struct Multi2Mapping_test : public Sofa_test * the resulting child position is compared with the expected one. * Additionally, the Jacobian-related methods are tested using finite differences. * - * The parent coordinates are transfered in the parent states, then the scene is initialized, then various mapping functions are applied. + * The parent coordinates are transferred in the parent states, then the scene is initialized, then various mapping functions are applied. * The parent states are resized based on the size of the parentCoords vectors. The child state is not resized. Its should be already sized, * or its size set automatically during initialization. * diff --git a/applications/plugins/SofaTest/MultiMapping_test.h b/applications/plugins/SofaTest/MultiMapping_test.h index 3c16e4dd103..845690b3f4e 100644 --- a/applications/plugins/SofaTest/MultiMapping_test.h +++ b/applications/plugins/SofaTest/MultiMapping_test.h @@ -85,7 +85,7 @@ struct MultiMapping_test : public Sofa_test type::vector parents; ///< Parent nodes, created by setupScene simulation::Simulation* simulation; ///< created by the constructor an re-used in the tests std::pair deltaRange; ///< The minimum and maximum magnitudes of the change of each scalar value of the small displacement is deltaRange * numeric_limits::epsilon. This epsilon is 1.19209e-07 for float and 2.22045e-16 for double. - Real errorMax; ///< The test is successfull if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon + Real errorMax; ///< The test is successful if the (infinite norm of the) difference is less than maxError * numeric_limits::epsilon MultiMapping_test():deltaRange(1,1000),errorMax(10) @@ -122,7 +122,7 @@ struct MultiMapping_test : public Sofa_test - /** Returns OutCoord substraction a-b (should return a OutDeriv, but???) + /** Returns OutCoord subtraction a-b (should return a OutDeriv, but???) */ OutDeriv difference( const OutCoord& c1, const OutCoord& c2 ) { @@ -136,7 +136,7 @@ struct MultiMapping_test : public Sofa_test * the resulting child position is compared with the expected one. * Additionally, the Jacobian-related methods are tested using finite differences. * - * The parent coordinates are transfered in the parent states, then the scene is initialized, then various mapping functions are applied. + * The parent coordinates are transferred in the parent states, then the scene is initialized, then various mapping functions are applied. * The parent states are resized based on the size of the parentCoords vectors. The child state is not resized. Its should be already sized, * or its size set automatically during initialization. * diff --git a/applications/plugins/SofaTest/PrimitiveCreation.cpp b/applications/plugins/SofaTest/PrimitiveCreation.cpp index 04b83599e12..436d9164b2e 100644 --- a/applications/plugins/SofaTest/PrimitiveCreation.cpp +++ b/applications/plugins/SofaTest/PrimitiveCreation.cpp @@ -78,7 +78,7 @@ sofa::component::collision::geometry::TriangleCollisionModel & dvelocities = *triDOF->write( sofa::core::VecId::velocity() ); MechanicalObject3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -103,7 +103,7 @@ sofa::component::collision::geometry::TriangleCollisionModeladdObject(triCollisionModel); - //editting the OBBModel + //editing the OBBModel triCollisionModel->init(); return triCollisionModel; @@ -144,7 +144,7 @@ sofa::component::collision::geometry::SphereCollisionModel & dvelocities = *sphereDOF->write( sofa::core::VecId::velocity() ); MechanicalObjectRigid3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -187,7 +187,7 @@ sofa::component::collision::geometry::SphereCollisionModel & dvelocities = *sphereDOF->write( sofa::core::VecId::velocity() ); MechanicalObject3::VecDeriv & velocities = *dvelocities.beginEdit(); @@ -201,7 +201,7 @@ sofa::component::collision::geometry::SphereCollisionModel::SPtr sphereCollisionModel = New>(); sphere->addObject(sphereCollisionModel); - //editting the RigidSphereModel + //editing the RigidSphereModel sphereCollisionModel->init(); sofa::component::collision::geometry::SphereCollisionModel::VecReal & vecRad = *(sphereCollisionModel->radius.beginEdit()); diff --git a/applications/plugins/SofaTest/doc/Doxyfile b/applications/plugins/SofaTest/doc/Doxyfile index b0556df29f6..d7c8533d06f 100644 --- a/applications/plugins/SofaTest/doc/Doxyfile +++ b/applications/plugins/SofaTest/doc/Doxyfile @@ -289,10 +289,10 @@ TYPEDEF_HIDES_STRUCT = NO # For small to medium size projects (<1000 input files) the default value is # probably good enough. For larger projects a too small cache size can cause # doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. +# causing a significant performance penalty. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglTetrahedralModel.inl b/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglTetrahedralModel.inl index 107c9374cac..39cf0ec285e 100644 --- a/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglTetrahedralModel.inl +++ b/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglTetrahedralModel.inl @@ -57,7 +57,7 @@ void OglTetrahedralModel::init() sofa::core::objectmodel::BaseContext* context = this->getContext(); m_topology = context->getMeshTopology(); - //instanciate the mapping tables + //instantiate the mapping tables //Useful for the PT algorithm only sofa::type::vector listVec4Variables; this->getContext()->core::objectmodel::BaseContext::template get > @@ -80,7 +80,7 @@ void OglTetrahedralModel::init() if (!m_mappingTableValues) { - msg_info() << "No MappingTable found, instanciating one"; + msg_info() << "No MappingTable found, instantiating one"; m_mappingTableValues = sofa::core::objectmodel::New(); m_mappingTableValues->setName("MappingTable"); m_mappingTableValues->setID("MappingTable"); @@ -103,7 +103,7 @@ void OglTetrahedralModel::init() } if (!m_runSelectTableValues) { - msg_info() << "No RunSelectTable found, instanciating one"; + msg_info() << "No RunSelectTable found, instantiating one"; m_runSelectTableValues = sofa::core::objectmodel::New(); m_runSelectTableValues->setName("RunSelectTable"); diff --git a/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglVolumetricModel.cpp b/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglVolumetricModel.cpp index a583a8dcf11..af943ece023 100644 --- a/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglVolumetricModel.cpp +++ b/applications/plugins/VolumetricRendering/src/VolumetricRendering/OglVolumetricModel.cpp @@ -71,7 +71,7 @@ void OglVolumetricModel::init() - //instanciate the mapping tables + //instantiate the mapping tables //Useful for the PT algorithm only sofa::type::vector listVec4Variables; this->getContext()->core::objectmodel::BaseContext::template get > @@ -94,7 +94,7 @@ void OglVolumetricModel::init() if (!m_mappingTableValues) { - msg_info() << "No MappingTable found, instanciating one"; + msg_info() << "No MappingTable found, instantiating one"; m_mappingTableValues = sofa::core::objectmodel::New(); m_mappingTableValues->setName("MappingTable"); m_mappingTableValues->setID("MappingTable"); @@ -115,7 +115,7 @@ void OglVolumetricModel::init() } if (!m_runSelectTableValues) { - msg_info() << "No RunSelectTable found, instanciating one"; + msg_info() << "No RunSelectTable found, instantiating one"; m_runSelectTableValues = sofa::core::objectmodel::New(); m_runSelectTableValues->setName("RunSelectTable"); @@ -198,7 +198,7 @@ void OglVolumetricModel::doInitVisual(const core::visual::VisualParams* vparams) } if (!m_vertexColors) { - msg_error() << "No attributes called a_vertexColor found, instanciating one with a default color"; + msg_error() << "No attributes called a_vertexColor found, instantiating one with a default color"; m_vertexColors = sofa::core::objectmodel::New(); m_vertexColors->setName("a_vertexColor"); m_vertexColors->setID("a_vertexColor"); diff --git a/applications/plugins/Xitact/ITPDriver.cpp b/applications/plugins/Xitact/ITPDriver.cpp index 733e2611833..c7d85cd6634 100644 --- a/applications/plugins/Xitact/ITPDriver.cpp +++ b/applications/plugins/Xitact/ITPDriver.cpp @@ -129,7 +129,7 @@ void ITPDriver::bwdInit() if (dynamic_cast*>(context->getMechanicalState()) == NULL) { this->f_printLog.setValue(true); - serr<<"ERROR : no MechanicalState defined... init of ITPDriver faild "< defined... init of ITPDriver failed "<_mstate = NULL; return ; } @@ -220,7 +220,7 @@ void ITPDriver::handleEvent(core::objectmodel::Event *event) { - // calcul des angles à partir de la direction proposée par l'interface... + // calcul des angles � partir de la direction propos�e par l'interface... // cos(ThetaX) = cx sin(ThetaX) = sx cos(ThetaZ) = cz sin(ThetaZ) = sz . // au repos (si cx=1 et cz=1) on a Axe y // on commence par tourner autour de x puis autour de z @@ -236,7 +236,7 @@ void ITPDriver::handleEvent(core::objectmodel::Event *event) xiTrocarQueryStates(); xiTrocarGetState(indexTool.getValue(), &state); - // saving informations in class structure. + // saving information in class structure. data.simuState = state; Vector3 dir; diff --git a/applications/plugins/Xitact/PaceMaker.cpp b/applications/plugins/Xitact/PaceMaker.cpp index b139ae6f9bb..cd4f0fda251 100644 --- a/applications/plugins/Xitact/PaceMaker.cpp +++ b/applications/plugins/Xitact/PaceMaker.cpp @@ -194,7 +194,7 @@ bool PaceMaker::createPace() } // namespace controller -} // namepace component +} // namespace component } // namespace sofa diff --git a/applications/plugins/Xitact/PaceMaker.h b/applications/plugins/Xitact/PaceMaker.h index 057af36012c..b8dc79daf05 100644 --- a/applications/plugins/Xitact/PaceMaker.h +++ b/applications/plugins/Xitact/PaceMaker.h @@ -105,7 +105,7 @@ class SOFA_XITACTPLUGIN_API PaceMaker } // namespace controller -} // namepace component +} // namespace component } // namespace sofa diff --git a/applications/plugins/image/CImgData.h b/applications/plugins/image/CImgData.h index 12851a34a44..d1034010ea7 100644 --- a/applications/plugins/image/CImgData.h +++ b/applications/plugins/image/CImgData.h @@ -229,7 +229,7 @@ struct Image : public BaseImage return res; } - // returns an image corresponing to a plane indexed by "coord" along "axis" and inside a bounding box + // returns an image corresponding to a plane indexed by "coord" along "axis" and inside a bounding box cimg_library::CImg get_plane(const unsigned int coord,const unsigned int axis,const type::Mat<2,3,unsigned int>& ROI,const unsigned int t=0, const bool mergeChannels=false) const { if(mergeChannels) return get_plane(coord,axis,ROI,t,false).norm(); @@ -581,7 +581,7 @@ struct ImageTypeInfo : public BaseImageTypeInfo enum { ValidInfo = BaseTypeInfo::ValidInfo }; ///< 1 if this type has valid infos enum { FixedSize = 1 }; ///< 1 if this type has a fixed size -> always 1 Image - enum { ZeroConstructor = 0 }; ///< 1 if the constructor is equivalent to setting memory to 0 -> I guess so, a default Image is initialzed with nothing + enum { ZeroConstructor = 0 }; ///< 1 if the constructor is equivalent to setting memory to 0 -> I guess so, a default Image is initialized with nothing enum { SimpleCopy = 0 }; ///< 1 if copying the data can be done with a memcpy enum { SimpleLayout = 0 }; ///< 1 if the layout in memory is simply N values of the same base type enum { Integer = 0 }; ///< 1 if this type uses integer values diff --git a/applications/plugins/image/Containers.h b/applications/plugins/image/Containers.h index dbd60c4bf79..0da1fb02165 100644 --- a/applications/plugins/image/Containers.h +++ b/applications/plugins/image/Containers.h @@ -134,7 +134,7 @@ class NoPreallocationVector } } - /// \return the index of the first occurence, if !present \return -1 + /// \return the index of the first occurrence, if !present \return -1 int find( const T& v ) const { for( unsigned i = 0 ; i<_size ; ++i ) @@ -150,7 +150,7 @@ class NoPreallocationVector return false; } - /// \return the index of the occurence, if !present \return -1 + /// \return the index of the occurrence, if !present \return -1 int getOffset( const T* v ) const { int offset = v - _array; diff --git a/applications/plugins/image/ImageAlgorithms.h b/applications/plugins/image/ImageAlgorithms.h index b29d85b475d..1ba4dfa2ec7 100644 --- a/applications/plugins/image/ImageAlgorithms.h +++ b/applications/plugins/image/ImageAlgorithms.h @@ -159,7 +159,7 @@ real Eikonal(const sofa::type::Vec<6,real>& d,const sofa::type::Vec<6,real>& d2, * Update geodesic distances in the image, given a bias distance function b(x). * This is equivalent to solve for the eikonal equation || grad d(x) || = 1/b(x) with d(p)=0 at @param pos * using fast marching method presented from sethian http://math.berkeley.edu/~sethian/2006/Publications/Book/2006/ -* distances should be intialized (<0 outside the object, >=0 inside, and = 0 for seeds) +* distances should be initialized (<0 outside the object, >=0 inside, and = 0 for seeds) * returns @param voronoi and @param distances */ @@ -229,7 +229,7 @@ void fastMarching (std::set > > &trial,cim * Update geodesic distances in the image given a bias distance function b(x). * This is equivalent to solve for the eikonal equation || grad d(x) || = 1/b(x) with d(p)=0 at @param pos * using dijkstra minimum path algorithm -* distances should be intialized (<0 outside the object, >=0 inside, and = 0 for seeds) +* distances should be initialized (<0 outside the object, >=0 inside, and = 0 for seeds) * returns @param voronoi and @param distances */ diff --git a/applications/plugins/image/ImageContainer.h b/applications/plugins/image/ImageContainer.h index 810334fda40..6481efa906b 100644 --- a/applications/plugins/image/ImageContainer.h +++ b/applications/plugins/image/ImageContainer.h @@ -299,7 +299,7 @@ struct ImageContainerSpecialization< defaulttype::Image > * * template * - * filename - the name of the image file to be loaded. Currently supported filtypes: + * filename - the name of the image file to be loaded. Currently supported filetypes: * */ template diff --git a/applications/plugins/image/ImageSampler.h b/applications/plugins/image/ImageSampler.h index 782db9b33f8..f27ac624ef4 100644 --- a/applications/plugins/image/ImageSampler.h +++ b/applications/plugins/image/ImageSampler.h @@ -89,7 +89,7 @@ struct ImageSamplerSpecialization> typedef typename ImageSamplerT::Hexa Hexa; - // get tranform and image at time t + // get transform and image at time t typename ImageSamplerT::raImage in(sampler->image); typename ImageSamplerT::raTransform inT(sampler->transform); const cimg_library::CImg& inimg = in->getCImg(sampler->time); @@ -161,7 +161,7 @@ struct ImageSamplerSpecialization> clock_t timer = clock(); - // get tranform and image at time t + // get transform and image at time t typename ImageSamplerT::raImage in(sampler->image); typename ImageSamplerT::raTransform inT(sampler->transform); const cimg_library::CImg& inimg = in->getCImg(sampler->time); @@ -276,7 +276,7 @@ struct ImageSamplerSpecialization> clock_t timer = clock(); - // get tranform and image at time t + // get transform and image at time t typename ImageSamplerT::raImage in(sampler->image); typename ImageSamplerT::raTransform inT(sampler->transform); const cimg_library::CImg& inimg = in->getCImg(sampler->time); diff --git a/applications/plugins/image/ImageViewer.h b/applications/plugins/image/ImageViewer.h index 16c3edde896..c350ecce182 100644 --- a/applications/plugins/image/ImageViewer.h +++ b/applications/plugins/image/ImageViewer.h @@ -68,7 +68,7 @@ namespace misc * * plane - * - * vectorvis - Describes the settings for vizualizing vectors and tensors. Input string should be in the form: + * vectorvis - Describes the settings for visualizing vectors and tensors. Input string should be in the form: * "subsampleXY subsampleZ scale rgb shape tensorOrder", where: * subsampleXY is an integer n where in the X and Y planes, a shape is drawn every n voxels. * subsampleZ is an integer n where in the Z plane, a shape is drawn every n voxels. diff --git a/applications/plugins/image/Kinect.h b/applications/plugins/image/Kinect.h index e0f144f60cf..cf3dccbeb69 100644 --- a/applications/plugins/image/Kinect.h +++ b/applications/plugins/image/Kinect.h @@ -256,7 +256,7 @@ class Kinect : public virtual core::objectmodel::BaseObject int user_device_number = (int)this->deviceID.getValue(); if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) { serr<<"Could not open device "<> (std::istream& in, VectorVis& v) { diff --git a/applications/plugins/image/VoronoiToMeshEngine.h b/applications/plugins/image/VoronoiToMeshEngine.h index 31a4d240bab..e09f6a158c3 100644 --- a/applications/plugins/image/VoronoiToMeshEngine.h +++ b/applications/plugins/image/VoronoiToMeshEngine.h @@ -88,7 +88,7 @@ class VoronoiToMeshEngine : public core::DataEngine typedef helper::WriteOnlyAccessor > waTriangles; Data< SeqTriangles > triangles; ///< output triangles - Data< Real > minLength; ///< minimun edge length in pixels + Data< Real > minLength; ///< minimum edge length in pixels VoronoiToMeshEngine() : Inherited() , showMesh(initData(&showMesh,false,"showMesh","show reconstructed mesh")) @@ -98,7 +98,7 @@ class VoronoiToMeshEngine : public core::DataEngine , position(initData(&position,SeqPositions(),"position","output positions")) , edges(initData(&edges,SeqEdges(),"edges","output edges")) , triangles(initData(&triangles,SeqTriangles(),"triangles","output triangles")) - , minLength(initData(&minLength,(Real)2.,"minLength","minimun edge length in pixels")) + , minLength(initData(&minLength,(Real)2.,"minLength","minimum edge length in pixels")) , time((unsigned int)0) { image.setReadOnly(true); @@ -170,7 +170,7 @@ class VoronoiToMeshEngine : public core::DataEngine return true; } - // remove edges bellow a certain length + // remove edges below a certain length inline bool removeSmallEdges(IDtoInd& neighbors,IDtoInd& regions,IDtoCoord& coords, IDtoCoordAndUI& sums,const Real& tol) const { Real tol2=tol*tol; @@ -296,7 +296,7 @@ class VoronoiToMeshEngine : public core::DataEngine // merge points close to each other count = 0; IDtoCoordAndUI coordsum; - for(IDtoCoordIt p=coords.begin();p!=coords.end();++p) coordsum[p->first]=std::pair(p->second,1); // intitialize accumulator of coords + for(IDtoCoordIt p=coords.begin();p!=coords.end();++p) coordsum[p->first]=std::pair(p->second,1); // initialize accumulator of coords while(!removeSmallEdges(neighbors,regions,coords,coordsum,minLength.getValue())) count++; for(IDtoCoordIt p=coords.begin();p!=coords.end();++p) p->second = coordsum[p->first].first/(Real)coordsum[p->first].second; // average to get mean of merged points if(this->f_printLog.getValue()) std::cout<name<<": removed "< - + diff --git a/applications/plugins/image/examples/MeshesToImage_Fill.scn b/applications/plugins/image/examples/MeshesToImage_Fill.scn index 215382a2173..efdd8d15e61 100644 --- a/applications/plugins/image/examples/MeshesToImage_Fill.scn +++ b/applications/plugins/image/examples/MeshesToImage_Fill.scn @@ -12,7 +12,7 @@ - + diff --git a/applications/plugins/image/examples/openMeshToImage.html b/applications/plugins/image/examples/openMeshToImage.html index 8a50a6a9d90..98a5d47e3a5 100644 --- a/applications/plugins/image/examples/openMeshToImage.html +++ b/applications/plugins/image/examples/openMeshToImage.html @@ -6,7 +6,7 @@ PluginImage

PluginImage openMeshToImage Example


This scene shows an example of the image plugin. It constructs a 3D voxel image from a surface mesh (cf. MeshToImage.scn) however -in this case the mesh given is not a closed one, which means with holes. It shows also the possiblity of filling holes in the mesh +in this case the mesh given is not a closed one, which means with holes. It shows also the possibility of filling holes in the mesh from the 3D voxel image. To run it, you need to load image Plugin using the Plugin Manager of the GUI, or the command line. diff --git a/applications/plugins/image/examples/sampler_meshSpring.html b/applications/plugins/image/examples/sampler_meshSpring.html index 2b08f02a9ad..e526aca5972 100644 --- a/applications/plugins/image/examples/sampler_meshSpring.html +++ b/applications/plugins/image/examples/sampler_meshSpring.html @@ -6,7 +6,7 @@ PluginImage

PluginImage Sampler_meshSpring Example


-This scene shows anohter example of the sampler of image plugin. It shows the use of the sampler with meshSpring model for simulation. +This scene shows another example of the sampler of image plugin. It shows the use of the sampler with meshSpring model for simulation.
Run and shift+rightclick the object to get it moving.
diff --git a/applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.h b/applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.h index c14c8874b19..43d1bdab573 100644 --- a/applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.h +++ b/applications/plugins/image/image_gui/src/image_gui/ImagePlaneWidget.h @@ -564,7 +564,7 @@ class imageplane_data_widget_container: public QObject Q_OBJECT; public slots: - virtual void handleSliderPolicies()=0; // needed for synchronization of slider visiblity + virtual void handleSliderPolicies()=0; // needed for synchronization of slider visibility }; template diff --git a/applications/plugins/image/image_test/ImageEngine_test.cpp b/applications/plugins/image/image_test/ImageEngine_test.cpp index 50ad94855fa..7890e89d929 100644 --- a/applications/plugins/image/image_test/ImageEngine_test.cpp +++ b/applications/plugins/image/image_test/ImageEngine_test.cpp @@ -40,7 +40,7 @@ namespace sofa { /** Test suite for engine data image. * Create a simple scene with an engine which computes an output image from an input image at each time step. * Visualize the output image of the engine with ImageViewer. - * The input image of ImageViewer is then linked to the ouput image of the engine. + * The input image of ImageViewer is then linked to the output image of the engine. * Copy on Write option is true. * Note: the function draw of ImageViewer is actually not called in this test (it works with the gui). */ @@ -58,7 +58,7 @@ struct ImageEngine_test : public sofa::testing::BaseTest } // Test link - /// To suceed this test need imagemagick to be installed. + /// To succeed this test need imagemagick to be installed. void testDataLink() { typedef defaulttype::Image Image; @@ -342,10 +342,10 @@ typedef ::testing::Types< ,TestDataEngine< component::engine::TestImageEngine > ,TestDataEngine< component::engine::TransferFunction > ,TestDataEngine< component::engine::VoronoiToMeshEngine > -> TestTypes; // the types to instanciate. +> TestTypes; // the types to instantiate. -//// ========= Tests to run for each instanciated type +//// ========= Tests to run for each instantiated type TYPED_TEST_SUITE( ImageDataEngine_test, TestTypes ); //// test number of call to DataEngine::update diff --git a/applications/plugins/image/image_test/TestImageEngine.h b/applications/plugins/image/image_test/TestImageEngine.h index 49dff4822b9..bb66c5c2856 100644 --- a/applications/plugins/image/image_test/TestImageEngine.h +++ b/applications/plugins/image/image_test/TestImageEngine.h @@ -41,7 +41,7 @@ namespace engine /** * This class is only used to test engine with image data. - * Given a input image the ouput image will have the same dimension as input image and all pixels will be 0. + * Given a input image the output image will have the same dimension as input image and all pixels will be 0. */ template class TestImageEngine : public core::DataEngine @@ -62,11 +62,11 @@ class TestImageEngine : public core::DataEngine typedef helper::ReadAccessor > raImage; Data< ImageTypes > inputImage; ///< input image - Data< ImageTypes > outputImage; ///< ouput image + Data< ImageTypes > outputImage; ///< output image TestImageEngine() : Inherited() , inputImage(initData(&inputImage,ImageTypes(),"inputImage","input image")) - , outputImage(initData(&outputImage,ImageTypes(),"outputImage","ouput image")) + , outputImage(initData(&outputImage,ImageTypes(),"outputImage","output image")) { inputImage.setReadOnly(true); } diff --git a/applications/plugins/image/imagetoolbox/imagetoolboxcentralwidget.h b/applications/plugins/image/imagetoolbox/imagetoolboxcentralwidget.h index 3a34726e309..6377ddda388 100644 --- a/applications/plugins/image/imagetoolbox/imagetoolboxcentralwidget.h +++ b/applications/plugins/image/imagetoolbox/imagetoolboxcentralwidget.h @@ -140,7 +140,7 @@ class SOFA_IMAGE_GUI_API ImageToolBoxCentralWidget: public QWidget Q_OBJECT public slots: - virtual void handleSliderPolicies()=0; // needed for synchronization of slider visiblity + virtual void handleSliderPolicies()=0; // needed for synchronization of slider visibility virtual void setVisibleXY(bool)=0; virtual void setVisibleXZ(bool)=0; virtual void setVisibleZY(bool)=0; diff --git a/applications/plugins/image/imagetoolbox/imagetoolboxwidget.h b/applications/plugins/image/imagetoolbox/imagetoolboxwidget.h index 11b3b184cf9..dfb343d5454 100644 --- a/applications/plugins/image/imagetoolbox/imagetoolboxwidget.h +++ b/applications/plugins/image/imagetoolbox/imagetoolboxwidget.h @@ -52,7 +52,7 @@ class SOFA_IMAGE_GUI_API imagetoolbox_data_widget_container: public QObject Q_OBJECT; public slots: - virtual void handleSliderPolicies()=0; // needed for synchronization of slider visiblity + virtual void handleSliderPolicies()=0; // needed for synchronization of slider visibility //virtual void draw()=0; signals: diff --git a/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.h b/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.h index 268cdc6cd87..b20193bdf0f 100644 --- a/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.h +++ b/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.h @@ -438,7 +438,7 @@ class SOFA_IMAGE_GUI_API LabelGridImageToolBoxNoTemplated: public LabelImageTool * @brief cutSection * @return * - * @todo fix error when the vector is composed of 2 points (out of the box, the lines pass throuth the box ) + * @todo fix error when the vector is composed of 2 points (out of the box, the lines pass through the box ) */ bool cutSection() diff --git a/applications/plugins/image/imagetoolbox/labelimagetoolbox.h b/applications/plugins/image/imagetoolbox/labelimagetoolbox.h index 031d2e5b60d..bd1a247a06c 100644 --- a/applications/plugins/image/imagetoolbox/labelimagetoolbox.h +++ b/applications/plugins/image/imagetoolbox/labelimagetoolbox.h @@ -67,7 +67,7 @@ using type::Mat; using namespace cimg_library; /** - * This class coorespond to a label visualized by imagetoolbox + * This class corresponds to a label visualized by imagetoolbox */ class SOFA_IMAGE_GUI_API LabelImageToolBox : public core::DataEngine diff --git a/applications/plugins/image/python/SofaImage/API.py b/applications/plugins/image/python/SofaImage/API.py index c8c6096f2d7..8fb6a1190b1 100644 --- a/applications/plugins/image/python/SofaImage/API.py +++ b/applications/plugins/image/python/SofaImage/API.py @@ -99,7 +99,7 @@ def __addMesh(self, mesh, closingValue=None, roiIndices=list(), roiValue=list(), mesh.mergeROIs = self.node.createObject('MergeROIs', name="mergeROIs_"+name, nbROIs=len(roiIndices), **args) mesh.roiIndices=mesh.mergeROIs.getLinkPath()+".roiIndices" # use mergeROIs to potentially combine other rois (from meshclosing, boxRois, etc.) - # but here, roiIndices reformating to "[i,j,..] [k,l,..]" would work.. + # but here, roiIndices reformatting to "[i,j,..] [k,l,..]" would work.. self.meshes[name] = mesh self.meshSeq.append(name) diff --git a/applications/plugins/image/python/SofaImage/Tools.py b/applications/plugins/image/python/SofaImage/Tools.py index c8cb4241c00..2901b59b676 100644 --- a/applications/plugins/image/python/SofaImage/Tools.py +++ b/applications/plugins/image/python/SofaImage/Tools.py @@ -109,7 +109,7 @@ def transformToData(scale,offset,timeOffset=0,timeScale=1,isPerspective=0): """ return concat(offset[:3])+' '+concat(quat.to_euler(offset[3:])*180./math.pi)+' '+concat(scale)+' '+str(timeOffset)+' '+str(timeScale)+' '+str(int(isPerspective)) -# controller you must derived from and instanciate in the same context than your ImageViewer if you want to define actions to manually add / remove point from an image plane +# controller you must derived from and instantiate in the same context than your ImageViewer if you want to define actions to manually add / remove point from an image plane class ImagePlaneController(Sofa.PythonScriptController): def addPoint(self, id, x, y, z): return diff --git a/applications/projects/Modeler/exec/Main.cpp b/applications/projects/Modeler/exec/Main.cpp index f55716f2c7b..6fc1e106b31 100644 --- a/applications/projects/Modeler/exec/Main.cpp +++ b/applications/projects/Modeler/exec/Main.cpp @@ -48,7 +48,7 @@ int main(int argc, char** argv) { sofa::component::initSofaComponentAll(); - // TODO: create additionnal handlers depending on command-line parameters + // TODO: create additional handlers depending on command-line parameters QApplication* application = new QApplication(argc, argv); (void)application; diff --git a/applications/projects/Modeler/lib/GraphModeler.h b/applications/projects/Modeler/lib/GraphModeler.h index 4ef7d664b00..07cdd79abc8 100644 --- a/applications/projects/Modeler/lib/GraphModeler.h +++ b/applications/projects/Modeler/lib/GraphModeler.h @@ -169,7 +169,7 @@ class GraphModeler : public SofaSceneGraphWidget void openModifyObject(QTreeWidgetItem *); /// Add the component in the PropertyWidget void addInPropertyWidget(QTreeWidgetItem *, bool clear = true); - /// Delete a componnent + /// Delete a component void deleteComponent(QTreeWidgetItem *item, bool saveHistory=true); /// Construct a node from a BaseElement, by passing the factory Node::SPtr buildNodeFromBaseElement(Node::SPtr node,xml::BaseElement *elem, bool saveHistory=false); @@ -202,7 +202,7 @@ public slots: void doubleClick(QTreeWidgetItem *, int column); void leftClick(QTreeWidgetItem *, const QPoint &, int ); void rightClick(const QPoint & p); - /// Context Menu Operation: collasping all the nodes below the current one + /// Context Menu Operation: collapsing all the nodes below the current one void collapseNode(); /// Context Menu Operation: expanding all the nodes below the current one void expandNode(); @@ -226,7 +226,7 @@ public slots: void openModifyObject(); /// Context Menu Operation: Add the component in the PropertyWidget void addInPropertyWidget(); - /// Context Menu Operation: Deleting a componnent + /// Context Menu Operation: Deleting a component void deleteComponent(); /// Close all opened configuration windows diff --git a/applications/projects/Modeler/lib/SofaModeler.cpp b/applications/projects/Modeler/lib/SofaModeler.cpp index 429c0ff48ce..f35c8d42475 100644 --- a/applications/projects/Modeler/lib/SofaModeler.cpp +++ b/applications/projects/Modeler/lib/SofaModeler.cpp @@ -1187,7 +1187,7 @@ void SofaModeler::runInSofa( const std::string &sceneFilename, Node* root) } } - //retrive plugins + //retrieve plugins typedef sofa::helper::system::PluginManager::PluginMap PluginMap; PluginMap& pluginMap = PluginManager::getInstance().getPluginMap(); PluginManager::PluginIterator it; diff --git a/applications/projects/Modeler/lib/SofaModeler.h b/applications/projects/Modeler/lib/SofaModeler.h index 2c95abf4e35..ef5e08f5336 100644 --- a/applications/projects/Modeler/lib/SofaModeler.h +++ b/applications/projects/Modeler/lib/SofaModeler.h @@ -244,7 +244,7 @@ protected slots: QMenu *windowMenu; QTextBrowser *infoItem; - /// Correspondance between a name clicked in the menu and a path to the preset + /// Correspondence between a name clicked in the menu and a path to the preset std::map< QMenu*, std::map< std::string, std::string > > mapPreset; diff --git a/applications/projects/SceneChecking/src/SceneChecking/SceneCheckAPIChange.cpp b/applications/projects/SceneChecking/src/SceneChecking/SceneCheckAPIChange.cpp index 43baeedd416..4a09f2ea0e9 100644 --- a/applications/projects/SceneChecking/src/SceneChecking/SceneCheckAPIChange.cpp +++ b/applications/projects/SceneChecking/src/SceneChecking/SceneCheckAPIChange.cpp @@ -107,7 +107,7 @@ void SceneCheckAPIChange::doCheckOn(sofa::simulation::Node* node) void SceneCheckAPIChange::installDefaultChangeSets() { // Template of addHookInChangeSet - // addHookInChangeSet warns the user about changes that occured within a component + // addHookInChangeSet warns the user about changes that occurred within a component // (change in API, behavior, default values, etc.) /* addHookInChangeSet("17.06", [this](Base* o){ diff --git a/applications/projects/SofaFlowVR/Main.cpp b/applications/projects/SofaFlowVR/Main.cpp index 9a40896bba4..949148f5814 100644 --- a/applications/projects/SofaFlowVR/Main.cpp +++ b/applications/projects/SofaFlowVR/Main.cpp @@ -385,7 +385,7 @@ class FlowVRInputMesh : public FlowVRObject Data maxVDist; // Velocity is estimated by searching the nearest primitive from each new point - // To do it we need to create an additionnal PointCollisionModel collision model, as well as a Detection and Intersection class + // To do it we need to create an additional PointCollisionModel collision model, as well as a Detection and Intersection class sofa::simulation::tree::GNode * newPointsNode; typedef sofa::simulation::tree::GNode::Sequence::iterator CMIterator; sofa::component::container::MechanicalObject * newPoints; diff --git a/applications/projects/SofaGuiGlut/CMakeLists.txt b/applications/projects/SofaGuiGlut/CMakeLists.txt index 495668cfcb2..705817ead2c 100644 --- a/applications/projects/SofaGuiGlut/CMakeLists.txt +++ b/applications/projects/SofaGuiGlut/CMakeLists.txt @@ -22,7 +22,7 @@ else() # Workaround: on OS X, "${GLUT_glut_LIBRARY}" is not a target (it is # actually "-framework GLUT"), so we use find_library to find # something better (like /System/Library/Frameworks/GLUT.framework.) - # (Fun fact: FindGLUT.cmake litterally reads "These values for Apple + # (Fun fact: FindGLUT.cmake literally reads "These values for Apple # could probably do with improvement.)" find_library(ACTUAL_GLUT_LIBRARIES "GLUT") set(GLUT_ACTUAL_LIBRARIES ${ACTUAL_GLUT_LIBRARIES} ) diff --git a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsAPI.h b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsAPI.h index f565b17272a..3149872b8c6 100644 --- a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsAPI.h +++ b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsAPI.h @@ -152,7 +152,7 @@ class SOFA_SOFAPHYSICSAPI_API SofaPhysicsAPI double getCurrentFPS() const; double* getGravity() const; - /// Get the current scene gravity using the ouptut @param values which is a double[3]. Return error code. + /// Get the current scene gravity using the output @param values which is a double[3]. Return error code. int getGravity(double* values) const; /// Set the current scene gravity using the input @param gravity which is a double[3] void setGravity(double* gravity); @@ -197,11 +197,11 @@ class SOFA_SOFAPHYSICSAPI_API SofaPhysicsOutputMesh unsigned int getNbVertices(); ///< number of vertices const Real* getVPositions(); ///< vertices positions (Vec3) - int getVPositions(Real* values); ///< get the positions/vertices of this mesh inside ouput @param values, of type Real[ 3*nbVertices ]. Return error code. + int getVPositions(Real* values); ///< get the positions/vertices of this mesh inside output @param values, of type Real[ 3*nbVertices ]. Return error code. const Real* getVNormals(); ///< vertices normals (Vec3) - int getVNormals(Real* values); ///< get the normals per vertex of this mesh inside ouput @param values, of type Real[ 3*nbVertices ]. Return error code. + int getVNormals(Real* values); ///< get the normals per vertex of this mesh inside output @param values, of type Real[ 3*nbVertices ]. Return error code. const Real* getVTexCoords(); ///< vertices UVs (Vec2) - int getVTexCoords(Real* values); ///< get the texture coordinates (UV) per vertex of this mesh inside ouput @param values, of type Real[ 2*nbVertices ]. Return error code. + int getVTexCoords(Real* values); ///< get the texture coordinates (UV) per vertex of this mesh inside output @param values, of type Real[ 2*nbVertices ]. Return error code. int getTexCoordRevision(); ///< changes each time texture coord data are updated int getVerticesRevision(); ///< changes each time vertices data are updated @@ -218,12 +218,12 @@ class SOFA_SOFAPHYSICSAPI_API SofaPhysicsOutputMesh unsigned int getNbTriangles(); ///< number of triangles const Index* getTriangles(); ///< triangles topology (3 indices / triangle) - int getTriangles(int* values); ///< get the triangle topology inside ouput @param values, of type int[ 3*nbTriangles ]. Return error code. + int getTriangles(int* values); ///< get the triangle topology inside output @param values, of type int[ 3*nbTriangles ]. Return error code. int getTrianglesRevision(); ///< changes each time triangles data is updated unsigned int getNbQuads(); ///< number of quads const Index* getQuads(); ///< quads topology (4 indices / quad) - int getQuads(int* values); ///< get the quad topology inside ouput @param values, of type int[ 4*nbQuads ]. Return error code. + int getQuads(int* values); ///< get the quad topology inside output @param values, of type int[ 4*nbQuads ]. Return error code. int getQuadsRevision(); ///< changes each time quads data is updated /// Internal implementation sub-class diff --git a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.h b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.h index a13cc2f671a..ffcb8ca2838 100644 --- a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.h +++ b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.h @@ -64,7 +64,7 @@ EXPORT_API float sofaPhysicsAPI_time(void* api_ptr); ///< Getter to the current EXPORT_API float sofaPhysicsAPI_timeStep(void* api_ptr); ///< Getter to the current simulation time stepping EXPORT_API void sofaPhysicsAPI_setTimeStep(void* api_ptr, double value); ///< Setter to the current simulation time stepping -EXPORT_API int sofaPhysicsAPI_getGravity(void* api_ptr, double* values); ///< Getter of scene gravity using the ouptut @param values which is a double[3]. Return error code. +EXPORT_API int sofaPhysicsAPI_getGravity(void* api_ptr, double* values); ///< Getter of scene gravity using the output @param values which is a double[3]. Return error code. EXPORT_API int sofaPhysicsAPI_setGravity(void* api_ptr, double* values); ///< Setter of current scene gravity using the input @param gravity which is a double[3]. Return error code. // API for message logging @@ -84,15 +84,15 @@ EXPORT_API const char* sofaVisualModel_getName(void* api_api_ptr, int VModelID); /// API to get SofaPhysicsOutputMesh position and topology information. /// SofaPhysicsOutputMesh Name is used as identifier as the index of registration could change from one loading to another. Or if scene is modified. EXPORT_API int sofaVisualModel_getNbVertices(void* api_api_ptr, const char* name); ///< Return the number of vertices of the SofaPhysicsOutputMesh with name: @param name -EXPORT_API int sofaVisualModel_getVertices(void* api_api_ptr, const char* name, float* buffer); ///< Get the positions/vertices using ouput @param values (type float[ 3*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. -EXPORT_API int sofaVisualModel_getNormals(void* api_ptr, const char* name, float* buffer); ///< Get the normals using ouput @param values (type float[ 3*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. -EXPORT_API int sofaVisualModel_getTexCoords(void* api_ptr, const char* name, float* buffer); ///< Get the texture coordinates using ouput @param values (type float[ 2*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getVertices(void* api_api_ptr, const char* name, float* buffer); ///< Get the positions/vertices using output @param values (type float[ 3*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getNormals(void* api_ptr, const char* name, float* buffer); ///< Get the normals using output @param values (type float[ 3*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getTexCoords(void* api_ptr, const char* name, float* buffer); ///< Get the texture coordinates using output @param values (type float[ 2*nbVertices ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. EXPORT_API int sofaVisualModel_getNbEdges(void* api_ptr, const char* name); ///< Return the number of edges of the SofaPhysicsOutputMesh with name: @param name -EXPORT_API int sofaVisualModel_getEdges(void* api_ptr, const char* name, int* buffer); ///< Get the edges using ouput @param values (type int[ 2*nbEdges ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getEdges(void* api_ptr, const char* name, int* buffer); ///< Get the edges using output @param values (type int[ 2*nbEdges ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. EXPORT_API int sofaVisualModel_getNbTriangles(void* api_ptr, const char* name); ///< Return the number of triangles of the SofaPhysicsOutputMesh with name: @param name -EXPORT_API int sofaVisualModel_getTriangles(void* api_ptr, const char* name, int* buffer); ///< Get the triangles using ouput @param values (type int[ 3*nbTriangles ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getTriangles(void* api_ptr, const char* name, int* buffer); ///< Get the triangles using output @param values (type int[ 3*nbTriangles ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. EXPORT_API int sofaVisualModel_getNbQuads(void* api_ptr, const char* name); ///< Return the number of quads of the SofaPhysicsOutputMesh with name: @param name -EXPORT_API int sofaVisualModel_getQuads(void* api_ptr, const char* name, int* buffer); ///< Get the quads using ouput @param values (type int[ 4*nbQuads ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. +EXPORT_API int sofaVisualModel_getQuads(void* api_ptr, const char* name, int* buffer); ///< Get the quads using output @param values (type int[ 4*nbQuads ]) of the SofaPhysicsOutputMesh with name: @param name. Return error code. diff --git a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh_impl.h b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh_impl.h index 189c8930a24..8a4dda07d5c 100644 --- a/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh_impl.h +++ b/applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh_impl.h @@ -40,11 +40,11 @@ class SOFA_SOFAPHYSICSAPI_API SofaPhysicsOutputMesh::Impl unsigned int getNbVertices(); ///< number of vertices const Real* getVPositions(); ///< vertices positions (Vec3) - int getVPositions(Real* values); ///< get the positions/vertices of this mesh inside ouput @param values, of type Real[ 3*nbVertices ] + int getVPositions(Real* values); ///< get the positions/vertices of this mesh inside output @param values, of type Real[ 3*nbVertices ] const Real* getVNormals(); ///< vertices normals (Vec3) - int getVNormals(Real* values); ///< get the normals per vertex of this mesh inside ouput @param values, of type Real[ 3*nbVertices ] + int getVNormals(Real* values); ///< get the normals per vertex of this mesh inside output @param values, of type Real[ 3*nbVertices ] const Real* getVTexCoords(); ///< vertices UVs (Vec2) - int getVTexCoords(Real* values); ///< get the texture coordinates (UV) per vertex of this mesh inside ouput @param values, of type Real[ 2*nbVertices ] + int getVTexCoords(Real* values); ///< get the texture coordinates (UV) per vertex of this mesh inside output @param values, of type Real[ 2*nbVertices ] int getTexCoordRevision(); ///< changes each time texture coord data are updated int getVerticesRevision(); ///< changes each time vertices data are updated @@ -61,12 +61,12 @@ class SOFA_SOFAPHYSICSAPI_API SofaPhysicsOutputMesh::Impl unsigned int getNbTriangles(); ///< number of triangles const Index* getTriangles(); ///< triangles topology (3 indices / triangle) - int getTriangles(int* values); ///< get the triangle topology inside ouput @param values, of type int[ 3*nbTriangles ] + int getTriangles(int* values); ///< get the triangle topology inside output @param values, of type int[ 3*nbTriangles ] int getTrianglesRevision(); ///< changes each time triangles data is updated unsigned int getNbQuads(); ///< number of quads const Index* getQuads(); ///< quads topology (4 indices / quad) - int getQuads(int* values); ///< get the quad topology inside ouput @param values, of type int[ 4*nbQuads ] + int getQuads(int* values); ///< get the quad topology inside output @param values, of type int[ 4*nbQuads ] int getQuadsRevision(); ///< changes each time quads data is updated typedef sofa::core::visual::VisualModel SofaVisualOutputMesh; diff --git a/applications/projects/myCfExport/myCfExport.cpp b/applications/projects/myCfExport/myCfExport.cpp index da17e331dab..afdad2c397f 100644 --- a/applications/projects/myCfExport/myCfExport.cpp +++ b/applications/projects/myCfExport/myCfExport.cpp @@ -140,7 +140,7 @@ int main(int argc, char** argv) fileName = files[0]; else { - fileName = "scenes"; // defaut file for storing the list of scenes + fileName = "scenes"; // default file for storing the list of scenes } fileName = std::string(MyCfExport_DIR) + "/" + fileName; // MyCfExport_DIR defined in CMakeLists.txt diff --git a/applications/projects/runSofa/Main.cpp b/applications/projects/runSofa/Main.cpp index 1b5bd15f88b..6688d961f1e 100644 --- a/applications/projects/runSofa/Main.cpp +++ b/applications/projects/runSofa/Main.cpp @@ -377,7 +377,7 @@ int main(int argc, char** argv) BaseGUI::setConfigDirectoryPath(Utils::getSofaPathPrefix() + "/config", true); BaseGUI::setScreenshotDirectoryPath(Utils::getSofaPathPrefix() + "/screenshots", true); - // Add Batch GUI (runSofa without any GUIs wont be useful) + // Add Batch GUI (runSofa without any GUIs won't be useful) sofa::gui::batch::init(); auto& pluginManager = PluginManager::getInstance(); @@ -413,7 +413,7 @@ int main(int argc, char** argv) } sofa::core::ObjectFactory* objectFactory = sofa::core::ObjectFactory::getInstance(); - // calling explicitely registerObjects from loadedPlugins + // calling explicitly registerObjects from loadedPlugins for (const auto& [pluginPath, plugin] : pluginManager.getPluginMap()) { const auto& pluginName = plugin.getModuleName(); @@ -424,7 +424,7 @@ int main(int argc, char** argv) addGUIParameters(argParser); argParser->parse(); - // Fetching file name must be done after the additionnal potential options have been added + // Fetching file name must be done after the additional potential options have been added // otherwise the first parsing will take the unknown options as the file name // (because of its positional parameter) files = argParser->getInputFileList(); diff --git a/applications/projects/sofaInitTimer/runInitTimer.sh b/applications/projects/sofaInitTimer/runInitTimer.sh index 167137341f7..9e5606da313 100755 --- a/applications/projects/sofaInitTimer/runInitTimer.sh +++ b/applications/projects/sofaInitTimer/runInitTimer.sh @@ -48,7 +48,7 @@ declare -i nerrors=0 if [[ $resetMode == 1 ]] then arguments=$(echo $arguments -r) - echo Reseting the InitTimer of files + echo Resetting the InitTimer of files else echo Run InitTimer with $iterations iterations: Set of files $iniFile fi diff --git a/applications/tutorials/anatomyModelling/anatomyModelling.cpp b/applications/tutorials/anatomyModelling/anatomyModelling.cpp index a3770228914..d161aac7edc 100644 --- a/applications/tutorials/anatomyModelling/anatomyModelling.cpp +++ b/applications/tutorials/anatomyModelling/anatomyModelling.cpp @@ -582,7 +582,7 @@ simulation::Node::SPtr createScene() multiMapping->addInputModel(insertionFrameDof.get()); // third parent multiMapping->addOutputModel(frameDof.get()); // deformable structure ////////// init subsetmultimapping position ////////// - // origin and inertion + // origin and insertion multiMapping->addPoint( originFrameDof.get(), 0 ); multiMapping->addPoint( insertionFrameDof.get(), 0 ); // moving frame diff --git a/cmake/Modules/FindICU.cmake b/cmake/Modules/FindICU.cmake index 59dd891afaa..7790e0ce314 100644 --- a/cmake/Modules/FindICU.cmake +++ b/cmake/Modules/FindICU.cmake @@ -172,7 +172,7 @@ if(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIR) set(${ICU_PUBLIC_VAR_NS}_VERSION_PATCH "0") elseif(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *U_ICU_VERSION_MAJOR_NUM *([0-9]+).*") # - # Since version 4.9.1, ICU release version numbering was totaly changed, see: + # Since version 4.9.1, ICU release version numbering was totally changed, see: # - http://site.icu-project.org/download/49 # - http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU # @@ -339,9 +339,9 @@ endfunction(_icu_extract_locale_from_rb) # - none (default): # * PACKAGE : if present, package all resource bundles together. Default is to stop after building individual *.res files # * TYPE : one of : -# + common or archive (default) : archive all ressource bundles into a single .dat file -# + library or dll : assemble all ressource bundles into a separate and loadable library (.dll/.so) -# + static : integrate all ressource bundles to targets designed by DEPENDS parameter (as a static library) +# + common or archive (default) : archive all resource bundles into a single .dat file +# + library or dll : assemble all resource bundles into a separate and loadable library (.dll/.so) +# + static : integrate all resource bundles to targets designed by DEPENDS parameter (as a static library) # * NO_SHARED_FLAGS : only with TYPE in ['library', 'dll', 'static'], do not append ICU_C(XX)_SHARED_FLAGS to targets given as DEPENDS argument # - JAVA: # * BUNDLE : required, prefix for generated classnames diff --git a/cmake/Modules/FindOpenCTM.cmake b/cmake/Modules/FindOpenCTM.cmake index 2b9e37d188e..40279e49a33 100644 --- a/cmake/Modules/FindOpenCTM.cmake +++ b/cmake/Modules/FindOpenCTM.cmake @@ -6,7 +6,7 @@ # OPENCTM_INCLUDE_PATH # OPENCTM_LIBRARY # -# lib directory of OpenCTM library should be linked to on of the path below under teh directory openctm +# lib directory of OpenCTM library should be linked to on of the path below under the directory openctm #include( Common ) diff --git a/cmake/Modules/FindOptiX.cmake b/cmake/Modules/FindOptiX.cmake index 8f93c447ad3..47ee7eccae6 100644 --- a/cmake/Modules/FindOptiX.cmake +++ b/cmake/Modules/FindOptiX.cmake @@ -134,7 +134,7 @@ if(APPLE) # the optix library. get_filename_component(_optix_name_of_optixu "${optixu_LIBRARY}" NAME) if(EXISTS "${_optix_path_to_optix}/${_optix_name_of_optixu}") - message(WARNING " optixu library found next to optix library that is not being used. Due to the way we are usin + message(WARNING " optixu library found next to optix library that is not being used. Due to the way we are using g rpath, the copy of optixu next to optix will be used during loading instead of the one you intended. Consider putting the libraries in the same directory or moving ${optixu_LIBRARY} out of the way.") endif() endif() diff --git a/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_assembledCG_blocs.scn b/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_assembledCG_blocs.scn index 01f2c6d497c..df78a57426d 100644 --- a/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_assembledCG_blocs.scn +++ b/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_assembledCG_blocs.scn @@ -28,7 +28,7 @@ The differences are in the way the global system matrix is built and solved: diff --git a/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_direct_blocs.scn b/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_direct_blocs.scn index 3a1e7a22ab2..0fd032ab6ac 100644 --- a/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_direct_blocs.scn +++ b/examples/Benchmark/Performance/MatrixAssembly/MatrixAssembly_direct_blocs.scn @@ -29,7 +29,7 @@ The differences are in the way the global system matrix is built and solved: diff --git a/examples/Component/Engine/GL/TextureInterpolation.scn b/examples/Component/Engine/GL/TextureInterpolation.scn index e19ca4360d5..238fd82d3b6 100644 --- a/examples/Component/Engine/GL/TextureInterpolation.scn +++ b/examples/Component/Engine/GL/TextureInterpolation.scn @@ -26,7 +26,7 @@ - diff --git a/examples/Component/IO/Mesh/LiverUseNewLoaders.scn b/examples/Component/IO/Mesh/LiverUseNewLoaders.scn index 33fc1206e06..7ccbbfd370c 100644 --- a/examples/Component/IO/Mesh/LiverUseNewLoaders.scn +++ b/examples/Component/IO/Mesh/LiverUseNewLoaders.scn @@ -39,7 +39,7 @@ + Attribute src is not allowed to overwrite non empty fields --> diff --git a/examples/Tutorials/Basic/TutorialBasicCube.html b/examples/Tutorials/Basic/TutorialBasicCube.html index c6e3fa6b9cd..f09b1b94c97 100644 --- a/examples/Tutorials/Basic/TutorialBasicCube.html +++ b/examples/Tutorials/Basic/TutorialBasicCube.html @@ -11,7 +11,7 @@
In this tutorial, a deformable cube undergoes internal and external forces. This is one of the simplest scenes we can simulate using Sofa. We use it to introduce the component structure.

- The shape is modeled using a MechanicalObject which desribes the particle states, and a Topology which describes how the particles are connected.
+ The shape is modeled using a MechanicalObject which describes the particle states, and a Topology which describes how the particles are connected.

The forces are the MeshSpringForceField, which defines springs according to the edges of the mesh (the Topology), and the PlaneForceField which try to prevent the particles to cross planes.

diff --git a/examples/Tutorials/Mappings/TutorialMappingBarycentric.html b/examples/Tutorials/Mappings/TutorialMappingBarycentric.html index 800bf2db824..33a475df199 100644 --- a/examples/Tutorials/Mappings/TutorialMappingBarycentric.html +++ b/examples/Tutorials/Mappings/TutorialMappingBarycentric.html @@ -72,7 +72,7 @@ You can interact with the mouse to see how the two barycentric mappings work together in the scene.
  • - With the mouse interaction you can accumlate forces at the level of the collision mechanical object in the "Surf" node. These forces are propagated back at the level of the "Liver" node using the barycentric mechanical mapping. + With the mouse interaction you can accumulate forces at the level of the collision mechanical object in the "Surf" node. These forces are propagated back at the level of the "Liver" node using the barycentric mechanical mapping.
  • The forces computed at the level of the behaviour model - the "Liver" node - create a motion, and our liver object now moves. In the "Visual" node the visual model now moves in a consistent way with respect to the behaviour model positions and velocities, thanks to the barycentric mapping. diff --git a/examples/Tutorials/Mappings/TutorialMappingIdentity.html b/examples/Tutorials/Mappings/TutorialMappingIdentity.html index 06b8f3b303e..13a0c3c31f5 100644 --- a/examples/Tutorials/Mappings/TutorialMappingIdentity.html +++ b/examples/Tutorials/Mappings/TutorialMappingIdentity.html @@ -18,7 +18,7 @@
    Key points

    - IdentityMapping can be used between two MechanicalObjects. Indeed, it will result in a duplication of the positions with the nicety that modifications of the first MechanicalObject will be transfered to the second MechanicalObject. + IdentityMapping can be used between two MechanicalObjects. Indeed, it will result in a duplication of the positions with the nicety that modifications of the first MechanicalObject will be transferred to the second MechanicalObject.
    Results

    diff --git a/examples/Tutorials/Mappings/TutorialMappingRigid.html b/examples/Tutorials/Mappings/TutorialMappingRigid.html index 9b04ddab40e..0bdba6f3b3f 100644 --- a/examples/Tutorials/Mappings/TutorialMappingRigid.html +++ b/examples/Tutorials/Mappings/TutorialMappingRigid.html @@ -15,14 +15,14 @@ A rigid body (perfectly rigid) is an undeformable body. Because its undeformable property, a rigid body composed a set of particles ensures that the distance of any pair of points and the angle of any pair of vectors remains constant in relation to time. Rigid bodies in SOFA are presented by different models (Visual Model, - Colision Model, Behaviour Model) ensuring their appropriate task. These models are related by a mapping + Collision Model, Behaviour Model) ensuring their appropriate task. These models are related by a mapping (rigid mapping in this case).
    Key points:
    • Model Behaviour Rigid : Position and orientation (quaternion) of the center(s) of mass.
      • -
    • Model Colision Rigid : A set of particles used for computing the collision with other objects.
      • +
    • Model Collision Rigid : A set of particles used for computing the collision with other objects.
    • Model Visual Rigid : A set of particles used for visualizing.
    diff --git a/examples/Tutorials/Mappings/TutorialMappingSkinning.html b/examples/Tutorials/Mappings/TutorialMappingSkinning.html index fab70565a72..2f1efcf4aec 100644 --- a/examples/Tutorials/Mappings/TutorialMappingSkinning.html +++ b/examples/Tutorials/Mappings/TutorialMappingSkinning.html @@ -32,7 +32,7 @@
  • Distance algorithms: To know this influence, we can use the distance of the particle of the skin to each simulated node. This distance can be:
      -
    • Euclidian
      • +
    • Euclidean
    • Geodesic
    • Harmonic
    diff --git a/examples/Tutorials/Solvers/ExplicitRungeKutta4.html b/examples/Tutorials/Solvers/ExplicitRungeKutta4.html index 90eaaeb482d..8ceab079c3b 100644 --- a/examples/Tutorials/Solvers/ExplicitRungeKutta4.html +++ b/examples/Tutorials/Solvers/ExplicitRungeKutta4.html @@ -11,7 +11,7 @@
    Description

    Like EulerSolver in Sofa, RungeKuttaSolver denotes the ODE solver using the explicit integration scheme for computing of - the dynamic system. This integration scheme explicitely resolves the system in relation to time: given the mechanical state + the dynamic system. This integration scheme explicitly resolves the system in relation to time: given the mechanical state at time Tn, compute the state at time Tn+1=Tn + dt. The difference with RungeKuttaSolver is that this integration use a more sophisticated algorithm for the computation of the state at time Tn+1. Therefore there is more stability and can use a higher time step than the EulerSolver one. Otherwise, RungeKuttaSolver uses a more general explicit method than EulerSolver. @@ -20,7 +20,7 @@
    Key points

    As with every Explicit Integration method, RungeKutta accumulates errors for each time step. Therefore, two criteria must be - controled when using it : + controlled when using it :
    • The time step dt.
    • The dynamic of the system.
      • diff --git a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06.html b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06.html index 3de5e94d087..b9c88e731df 100644 --- a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06.html +++ b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06.html @@ -18,7 +18,7 @@

      Connection with the Omni device

  • Added a driver for the Omni phantom device
  • Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation
  • Added a computation (LCPForceFeedback) of the haptic forces
    • -
  • Added VectorSpringForceField & JointSpringForceField to link the mouvements of the Omni phantom and the instrument
    • +
  • Added VectorSpringForceField & JointSpringForceField to link the movements of the Omni phantom and the instrument

Next

diff --git a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06a.html b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06a.html index d226f628a7a..4c809cdcb5e 100644 --- a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06a.html +++ b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06a.html @@ -14,7 +14,7 @@

Instrument visual model

Added a driver for the Omni phantom device
Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation
Added a computation (EnslavementForceFeedback) of the haptic forces
- Added VectorSpringForceField && JointSpringForceField to link the mouvements of the Omni phantom and the instrument
+ Added VectorSpringForceField && JointSpringForceField to link the movements of the Omni phantom and the instrument

Redo this tutorial with proximity collision

diff --git a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06b.html b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06b.html index e24eb249fcc..f27e30fd3a0 100644 --- a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06b.html +++ b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_06b.html @@ -14,7 +14,7 @@

Instrument visual model

Added a driver for the Omni phantom device
Added a mechanical state controller that gathers data from the phantom and updates the position of a representation of the device in the simulation
Added a computation (LCPForceFeedback) of the haptic forces
- Added VectorSpringForceField && JointSpringForceField to link the mouvements of the Omni phantom and the instrument
+ Added VectorSpringForceField && JointSpringForceField to link the movements of the Omni phantom and the instrument

Redo this tutorial with distance grid collision

diff --git a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_07.html b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_07.html index 3a4c0b5b66d..4955c1d380b 100644 --- a/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_07.html +++ b/examples/Tutorials/StepByStep/Dentistry_Haptics/dentalSurgery_07.html @@ -43,7 +43,7 @@

Deformable model of the Tongue

  • - The mass choosen for the deformable model of the tongue is a DiagonalMass. It has been choosen to show the diversity of masses available in SOFA. This kind of mass computes the mass matrix with non uniform diagonal values, depending on the tetrahedra size. + The mass chosen for the deformable model of the tongue is a DiagonalMass. It has been chosen to show the diversity of masses available in SOFA. This kind of mass computes the mass matrix with non uniform diagonal values, depending on the tetrahedra size.

    • diff --git a/examples/Tutorials/StepByStep/Getyourbearings/1_getyourbearings.html b/examples/Tutorials/StepByStep/Getyourbearings/1_getyourbearings.html index 5f31654695b..6d00042d337 100644 --- a/examples/Tutorials/StepByStep/Getyourbearings/1_getyourbearings.html +++ b/examples/Tutorials/StepByStep/Getyourbearings/1_getyourbearings.html @@ -14,7 +14,7 @@

    Get your bearings in SOFA

    - In this tutorial, we added the component OglGrid. It display a simple grid on a choosen plane. By default, the grid is displayed on the plane xy. + In this tutorial, we added the component OglGrid. It display a simple grid on a chosen plane. By default, the grid is displayed on the plane xy. If we know the size of the grid (10 units in the example), we can have a visual hint on the size of the liver. It also gives the orientation of the liver compared to the grid.

    diff --git a/examples/Tutorials/StepByStep/Pendulum/0_Pendulum.html b/examples/Tutorials/StepByStep/Pendulum/0_Pendulum.html index c250fcc95ee..36e14939b99 100644 --- a/examples/Tutorials/StepByStep/Pendulum/0_Pendulum.html +++ b/examples/Tutorials/StepByStep/Pendulum/0_Pendulum.html @@ -20,7 +20,7 @@ We used 3 components:
    • A Node "FirstObject" to store the components describing the object we want to simulate. It is important that the hierarchy of the nodes in the scene graph reflects the scene you want to model.
      • -
    • The shape is modeled using a MechanicalObject which desribes the particle states.
      • +
    • The shape is modeled using a MechanicalObject which describes the particle states.
    • A UniformMass is added for the MechanicalObject, giving the same mass for each particle of the MechanicalObject.
    diff --git a/examples/Tutorials/StepByStep/Pendulum/3_Pendulum.html b/examples/Tutorials/StepByStep/Pendulum/3_Pendulum.html index 70ffad2c1f5..df4e78d9ca4 100644 --- a/examples/Tutorials/StepByStep/Pendulum/3_Pendulum.html +++ b/examples/Tutorials/StepByStep/Pendulum/3_Pendulum.html @@ -8,7 +8,7 @@

    Creation of a Pendulum (4/8)

    Description
    -

    We saw that when the scene is animated, the particle doesn't move, just like the first scene in this tutorial. However, contrary to the first scene, our scene now results in a simulation being launched, forces accumulated, and an ODE computes the new positions and velocities! To be sure of that, we will add one particle to the MechanicalObject. The particle of index "0" will still be constrained to its origional position.

    +

    We saw that when the scene is animated, the particle doesn't move, just like the first scene in this tutorial. However, contrary to the first scene, our scene now results in a simulation being launched, forces accumulated, and an ODE computes the new positions and velocities! To be sure of that, we will add one particle to the MechanicalObject. The particle of index "0" will still be constrained to its original position.

    Double click the MechanicalObject node in the Modeler's scene graph. Click on the Vector 1/4 tab. At the top, you will see the position section.
    By using the arrows on the right or typing in the box, change the 1 to "2". In the X, Y, and Z position of the new row of the matrix (with index 1), enter "1", "0", and "0", respectively.

    diff --git a/examples/Tutorials/Tutorials.html b/examples/Tutorials/Tutorials.html index 1df5c285638..0a8fc11f8ff 100644 --- a/examples/Tutorials/Tutorials.html +++ b/examples/Tutorials/Tutorials.html @@ -19,7 +19,7 @@

    Tutorials for SOFA

    You can Change the description HTML to do step by step procedures
    -you can modify the graph, and drop objets from the Library of the Modeler +you can modify the graph, and drop objects from the Library of the Modeler diff --git a/scripts/deprecated/replace-object12-IO.sh b/scripts/deprecated/replace-object12-IO.sh index b6c2b72a879..7bf9de83726 100755 --- a/scripts/deprecated/replace-object12-IO.sh +++ b/scripts/deprecated/replace-object12-IO.sh @@ -5,7 +5,7 @@ # object2 --> output # WARNING: this script may modify your scene -# make sure you saved/commited all local changes before apply this script +# make sure you saved/committed all local changes before apply this script DIR0=$PWD cd "${0%/*}" diff --git a/scripts/rm-ObjectType.sh b/scripts/rm-ObjectType.sh index 749afdbc188..852c3e8666f 100755 --- a/scripts/rm-ObjectType.sh +++ b/scripts/rm-ObjectType.sh @@ -3,7 +3,7 @@ # This script removes in all the scenes the deprecated structure [^ \.].* " | # remove unneeded results grep -v "$base_dir" | # remove deps already satisfied locally - cut -c2- | # remove tabulation at beggining of each line + cut -c2- | # remove tabulation at beginning of each line sed -e 's/ (.*//g' | # keep only "libname => libpath" sort | uniq > "$output" diff --git a/tools/sofa-launcher/example.py b/tools/sofa-launcher/example.py index 6086a3315f4..13ff09cdbaa 100644 --- a/tools/sofa-launcher/example.py +++ b/tools/sofa-launcher/example.py @@ -43,7 +43,7 @@ def oneParticleSample(node): ############################################################################################ -# following defs are optionnal entry points, called by the PythonScriptController component; +# following defs are optional entry points, called by the PythonScriptController component; ############################################################################################ @@ -54,7 +54,7 @@ def onLoaded(self,node): print 'Controller script loaded from node %s'%node.findData('name').value return 0 - # optionnally, script can create a graph... + # optionally, script can create a graph... def createGraph(self,node): print 'createGraph called (python side)' diff --git a/tools/sofa-launcher/integration_example.py b/tools/sofa-launcher/integration_example.py index 87076b29e0d..10a950e32e1 100755 --- a/tools/sofa-launcher/integration_example.py +++ b/tools/sofa-launcher/integration_example.py @@ -73,7 +73,7 @@ filesandtemplates, launcher=SSHLauncher(hosts, "YOULOGIN", runSofaAbsPath="THEPATHTOSOFA/runSofa")) -# Start sofa returns a dictionnary +# Start sofa returns a dictionary for res in results: print("Results: ") print(" directory: "+res["directory"]) diff --git a/tools/sofa-launcher/launcher.py b/tools/sofa-launcher/launcher.py index 9798c2461dd..c237d53c33a 100644 --- a/tools/sofa-launcher/launcher.py +++ b/tools/sofa-launcher/launcher.py @@ -187,7 +187,7 @@ def startSofa(parameters, filesandtemplates, launcher): tasks = [] if not isinstance(parameters, list): - raise TypeError("the first parameter must be an list like structure of dictionnaries") + raise TypeError("the first parameter must be an list like structure of dictionaries") if not isinstance(parameters, list): raise TypeError("parameters must be a list like structure of tuple")