zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: sixDoFRigidBodyMotion. Fixing nan appearances when argument of acos > 1.0

Browse Source 
Adding more constraint reporting.

Changed order of evaluation of while condition to make +iter first,
otherwise doesn't increment iter, reporting 0 iterations.
This commit is contained in:
graham
2010-02-02 19:12:03 +00:00
parent 2170345d9e
commit c931631ffb
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
View File

@ -82,8 +82,6 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT)
forAll(constraints_, cI)
{
// Info<< nl << "Constraint " << cI << endl;
// constraint position
point cP = vector::zero;
@ -106,6 +104,23 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT)
allConverged = allConverged && constraintConverged;
if (report_)
{
Info<< "Constraint " << constraints_[cI].name()
<< ": force " << cF << " moment " << cM;
if (constraintConverged)
{
Info<< " - converged";
}
else
{
Info<< " - not converged";
}
Info<< endl;
}
// Accumulate constraint force
cFA += cF;
@ -113,7 +128,7 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT)
cMA += cM + ((cP - centreOfMass()) ^ cF);
}
} while(!allConverged && ++iter < maxConstraintIters_);
} while(++iter < maxConstraintIters_ && !allConverged);
if (iter >= maxConstraintIters_)
{

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
View File

@ -87,7 +87,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrain
deltaT
);
scalar theta = acos(predictedDir & fixedAxis_);
scalar theta = acos(min(predictedDir & fixedAxis_, 1.0));
vector rotationAxis = fixedAxis_ ^ predictedDir;

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
View File

@ -114,7 +114,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::constrain
{
predictedDir /= magPredictedDir;
theta = acos(predictedDir & refDir);
theta = acos(min(predictedDir & refDir, 1.0));
// Recalculating axis to give correct sign to angle
axis = (refDir ^ predictedDir);

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
View File

@ -106,7 +106,7 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
newDir -= (axis_ & newDir)*axis_;
newDir /= mag(newDir);
scalar theta = mag(acos(oldDir & newDir));
scalar theta = mag(acos(min(oldDir & newDir, 1.0)));
// Temporary axis with sign information.
vector a = (oldDir ^ newDir);

2
src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
View File

@ -108,7 +108,7 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
newDir -= (axis_ & newDir)*axis_;
newDir /= mag(newDir);
scalar theta = mag(acos(oldDir & newDir));
scalar theta = mag(acos(min(oldDir & newDir, 1.0)));
// Temporary axis with sign information.
vector a = (oldDir ^ newDir);