From ed6041eb50d843eb353f4da279532fb0741fc91d Mon Sep 17 00:00:00 2001 From: graham Date: Mon, 31 May 2010 12:00:53 +0100 Subject: [PATCH] ENH: Adding more useful information to sixDoFRigidBodyMotion restraint reporting. Making sixDoFRigidBodyMotionConstraints less verbose by default, now requires debug switch to be set. --- etc/controlDict | 1 + .../sixDoFRigidBodyDisplacementPointPatchVectorField.C | 7 +++++-- .../derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C | 6 +++--- .../sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C | 2 +- .../sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C | 2 +- .../fixedOrientation/fixedOrientation.C | 2 +- .../fixedPlane/fixedPlane.C | 2 +- .../fixedPoint/fixedPoint.C | 2 +- .../linearAxialAngularSpring/linearAxialAngularSpring.C | 2 +- .../linearSpring/linearSpring.C | 3 ++- .../ras/floatingObject/0.org/pointDisplacement | 1 - 11 files changed, 17 insertions(+), 13 deletions(-) diff --git a/etc/controlDict b/etc/controlDict index 891e010e0c..fe7ab2d9ca 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -726,6 +726,7 @@ DebugSwitches shapeList 0; shapeToCell 0; simple 0; + sixDoFRigidBodyMotionConstraint 0; skewCorrected 0; skewCorrectionVectors 0; sliced 0; diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C index 8b248991d5..ea9696ff59 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C @@ -248,10 +248,13 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const { pointPatchField::write(os); - os.writeKeyword("rhoInf") << rhoInf_ << token::END_STATEMENT << nl; - os.writeKeyword("rhoName") << rhoName_ << token::END_STATEMENT << nl; + if (rhoName_ == "rhoInf") + { + os.writeKeyword("rhoInf") << rhoInf_ << token::END_STATEMENT << nl; + } + if (lookupGravity_ == 0 || lookupGravity_ == -2) { os.writeKeyword("g") << g_ << token::END_STATEMENT << nl; diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C index a5c584a110..9f602618df 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C @@ -40,7 +40,7 @@ void Foam::sixDoFRigidBodyMotion::applyRestraints() { if (report_) { - Info<< "Restraint " << restraintNames_[rI]; + Info<< "Restraint " << restraintNames_[rI] << ": "; } // restraint position @@ -89,9 +89,9 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT) forAll(constraints_, cI) { - if (report_) + if (sixDoFRigidBodyMotionConstraint::debug) { - Info<< "Constraint " << constraintNames_[cI]; + Info<< "Constraint " << constraintNames_[cI] << ": "; } // constraint position diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C index becacd749c..85ce177bcb 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C @@ -121,7 +121,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrain bool converged(mag(theta) < tolerance_); - if (motion.report()) + if (sixDoFRigidBodyMotionConstraint::debug) { Info<< " angle " << theta << " force " << constraintForceIncrement diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C index b2e88aa657..cfa2f99762 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C @@ -107,7 +107,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrain bool converged(mag(error) < tolerance_); - if (motion.report()) + if (sixDoFRigidBodyMotionConstraint::debug) { Info<< " error " << error << " force " << constraintForceIncrement diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C index 6a6839b9be..b6eefaee11 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C @@ -143,7 +143,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::constrain bool converged(mag(maxTheta) < tolerance_); - if (motion.report()) + if (sixDoFRigidBodyMotionConstraint::debug) { Info<< " max angle " << maxTheta << " force " << constraintForceIncrement diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C index 38544533ce..004f6f152c 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C @@ -107,7 +107,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrain bool converged(mag(error) < tolerance_); - if (motion.report()) + if (sixDoFRigidBodyMotionConstraint::debug) { Info<< " error " << error << " force " << constraintForceIncrement diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C index c1a35d85c0..13a06991f2 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C @@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::constrain bool converged(mag(error) < tolerance_); - if (motion.report()) + if (sixDoFRigidBodyMotionConstraint::debug) { Info<< " error " << error << " force " << constraintForceIncrement diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C index 7116fbf7c8..2374097adc 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C @@ -136,7 +136,7 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain if (motion.report()) { - Info<< " angle " << theta + Info<< " angle " << theta*sign(a & axis_) << " force " << restraintForce << " moment " << restraintMoment << endl; diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C index 2983a4d862..999d1118e6 100644 --- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C +++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C @@ -96,7 +96,8 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::restrain if (motion.report()) { - Info<< " spring length " << magR + Info<< " attachmentPt - anchor " << r + << " spring length " << magR << " force " << restraintForce << " moment " << restraintMoment << endl; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement index c808bc16bc..cfd7b0e4be 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement @@ -37,7 +37,6 @@ boundaryField centreOfMass (0.5 0.5 0.5); momentOfInertia (0.08622222 0.08622222 0.144); mass 9.6; - rhoInf 1; report on; value uniform (0 0 0); }