diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index f5d9a1a7c77e39e6872154d33207e8fec4543827..b89971b17fb3099f20bfd0ffd7c8ff04fd3c86db 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -45,13 +45,6 @@ void Foam::sixDoFRigidBodyMotion::applyRestraints()
restraints_[rI].restrain(*this, rP, rF, rM);
- if (report_)
- {
- Info<< "Restraint " << restraints_[rI].name() << ": "
- << "force " << rF << " moment " << rM
- << endl;
- }
-
a() += rF/mass_;
// Moments are returned in global axes, transforming to
@@ -104,23 +97,6 @@ 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;
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 02eb2eb307bdb7463dfd968610ae7a1454d9dd7d..9993dfcece2b16f5f74470f575c6905706d86c11 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
@@ -119,7 +119,28 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedAxis::constrain
constraintForceIncrement = vector::zero;
- return (mag(theta) < tolerance_);
+ bool converged(mag(theta) < tolerance_);
+
+ if (motion.report())
+ {
+ Info<< "Constraint " << this->name()
+ << " angle " << theta
+ << " force " << constraintForceIncrement
+ << " moment " << constraintMomentIncrement;
+
+ if (converged)
+ {
+ Info<< " converged";
+ }
+ else
+ {
+ Info<< " not converged";
+ }
+
+ Info<< endl;
+ }
+
+ return converged;
}
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 b5cee9ecc2c65103b45593482609f34bedfee893..635267a259685dc663d1e2f0a6bf75fdf095dc93 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
@@ -105,7 +105,28 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedLine::constrain
constraintMomentIncrement = vector::zero;
- return (mag(error) < tolerance_);
+ bool converged(mag(error) < tolerance_);
+
+ if (motion.report())
+ {
+ Info<< "Constraint " << this->name()
+ << " error << " << error
+ << " force " << constraintForceIncrement
+ << " moment " << constraintMomentIncrement;
+
+ if (converged)
+ {
+ Info<< " converged";
+ }
+ else
+ {
+ Info<< " not converged";
+ }
+
+ Info<< endl;
+ }
+
+ return converged;
}
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 4a15e3e5492ebf333fcfdae1712234dd1110ad2e..74112ab3b40f24a9deee3f00c5693e56fd4581c9 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
@@ -146,7 +146,28 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedOrientation::constrain
constraintForceIncrement = vector::zero;
- return (mag(maxTheta) < tolerance_);
+ bool converged(mag(maxTheta) < tolerance_);
+
+ if (motion.report())
+ {
+ Info<< "Constraint " << this->name()
+ << " max angle " << maxTheta
+ << " force " << constraintForceIncrement
+ << " moment " << constraintMomentIncrement;
+
+ if (converged)
+ {
+ Info<< " converged";
+ }
+ else
+ {
+ Info<< " not converged";
+ }
+
+ Info<< endl;
+ }
+
+ return converged;
}
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 fad22e7c13c2182845a0932b8929818de2e77995..6d5ba4962bd375e5a38aa8d9a72f08ee314fb6bf 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
@@ -105,7 +105,28 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPlane::constrain
constraintMomentIncrement = vector::zero;
- return (mag(error) < tolerance_);
+ bool converged(mag(error) < tolerance_);
+
+ if (motion.report())
+ {
+ Info<< "Constraint " << this->name()
+ << " error " << error
+ << " force " << constraintForceIncrement
+ << " moment " << constraintMomentIncrement;
+
+ if (converged)
+ {
+ Info<< " converged";
+ }
+ else
+ {
+ Info<< " not converged";
+ }
+
+ Info<< endl;
+ }
+
+ return converged;
}
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 cfe8b5421d2e336e3e57e492ef766d4c0db4e777..5d03ab411f6a654fa9ff516b700b59dda7c33b37 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
@@ -114,7 +114,28 @@ bool Foam::sixDoFRigidBodyMotionConstraints::fixedPoint::constrain
constraintMomentIncrement = vector::zero;
- return (mag(error) < tolerance_);
+ bool converged(mag(error) < tolerance_);
+
+ if (motion.report())
+ {
+ Info<< "Constraint " << this->name()
+ << " error " << error
+ << " force " << constraintForceIncrement
+ << " moment " << constraintMomentIncrement;
+
+ if (converged)
+ {
+ Info<< " converged";
+ }
+ else
+ {
+ Info<< " not converged";
+ }
+
+ Info<< endl;
+ }
+
+ return converged;
}
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 373d2ea7d8d0baa5e1dbd911257f6a25d0531a52..5aa198f2b740cc521bdc7cafc02fe7d9f2f9014b 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
@@ -133,6 +133,15 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
// Not needed to be altered as restraintForce is zero, but set to
// centreOfMass to be sure of no spurious moment
restraintPosition = motion.centreOfMass();
+
+ if (motion.report())
+ {
+ Info<< "Restraint " << this->name()
+ << " angle " << theta
+ << " 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 966e911c6ee8ba4770e454599f4434942328bbdb..8067233e1c37a9e072284006606634e2c38c0965 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
@@ -93,6 +93,15 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::restrain
restraintForce = -stiffness_*(magR - restLength_)*r - damping_*(r & v)*r;
restraintMoment = vector::zero;
+
+ if (motion.report())
+ {
+ Info<< "Restraint " << this->name()
+ << " spring length " << magR
+ << " force " << restraintForce
+ << " moment " << restraintMoment
+ << endl;
+ }
}
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
index af11dcb421868c3e18a9dc7626cfd2ba7d4a4e0e..a961e5591a8f753eda327846216a8429c446aaa5 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
@@ -110,6 +110,14 @@ Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::restrain
// Not needed to be altered as restraintForce is zero, but set to
// centreOfMass to be sure of no spurious moment
restraintPosition = motion.centreOfMass();
+
+ if (motion.report())
+ {
+ Info<< "Restraint " << this->name()
+ << " force " << restraintForce
+ << " moment " << restraintMoment
+ << endl;
+ }
}
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index c1609e9df3115864b7863959abff99e08b387217..159419d44accff0022f9194aadf619341ab69fcc 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -133,6 +133,15 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
// Not needed to be altered as restraintForce is zero, but set to
// centreOfMass to be sure of no spurious moment
restraintPosition = motion.centreOfMass();
+
+ if (motion.report())
+ {
+ Info<< "Restraint " << this->name()
+ << " angle " << theta
+ << " force " << restraintForce
+ << " moment " << restraintMoment
+ << endl;
+ }
}
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
index b912643d7d106fade3709b99b8d127d6693a13b7..71f793e9de1e6be9ac193b6e1689222283e95701 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
@@ -59,7 +59,6 @@ moleculeProperties
mass 46.5e-27;
diameter 4.17e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.656e-5;
omega 0.74;
}
@@ -68,7 +67,6 @@ moleculeProperties
mass 53.12e-27;
diameter 4.07e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.919e-5;
omega 0.77;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
index f6c41d5c6fa45bda64903dde22d6dc7d267a04dc..273e2b2cbe52364a6582ede1a508747f2d3f43fd 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
@@ -69,7 +69,6 @@ moleculeProperties
mass 46.5e-27;
diameter 4.17e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.656e-5;
omega 0.74;
}
@@ -78,7 +77,6 @@ moleculeProperties
mass 53.12e-27;
diameter 4.07e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.919e-5;
omega 0.77;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
index 0b7f8022095486ba4588a7eb18e0d83d32b64f34..6fd38ae2e68c1805ddf00982b17dc4e779f49c33 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
@@ -80,7 +80,6 @@ moleculeProperties
mass 66.3e-27;
diameter 4.17e-10;
internalDegreesOfFreedom 0;
- viscosityCoefficient 2.117e-5;
omega 0.81;
}
}
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
index 1b010199f5f0f46aa75341d96764decf5de91d8c..d338013dcce4998074e9bc28c288543e5936af1c 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
@@ -71,7 +71,6 @@ moleculeProperties
mass 46.5e-27;
diameter 4.17e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.656e-5;
omega 0.74;
}
@@ -80,7 +79,6 @@ moleculeProperties
mass 53.12e-27;
diameter 4.07e-10;
internalDegreesOfFreedom 2;
- viscosityCoefficient 1.919e-5;
omega 0.77;
}
}