Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

etc/controlDict

@@ -726,6 +726,7 @@ DebugSwitches
     shapeList           0;
     shapeToCell         0;
     simple              0;
+    sixDoFRigidBodyMotionConstraint 0;
     skewCorrected       0;
     skewCorrectionVectors 0;
     sliced              0;

src/postProcessing/functionObjects/field/Make/files

@@ -19,6 +19,5 @@ streamLine/streamLine.C
 streamLine/streamLineParticle.C
 streamLine/streamLineParticleCloud.C
 streamLine/streamLineFunctionObject.C
-streamLine/vectorIOFieldField.C
 
 LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects

src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C

@@ -24,8 +24,7 @@ License
 \*----------------------------------------------------------------------------*/
 
 #include "streamLineParticle.H"
-#include "vectorIOFieldField.H"
-
+#include "vectorFieldIOField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -394,13 +393,13 @@ void Foam::streamLineParticle::readFields(Cloud<streamLineParticle>& c)
     );
     c.checkFieldIOobject(c, lifeTime);
 
-    vectorIOFieldField sampledPositions
+    vectorFieldIOField sampledPositions
     (
         c.fieldIOobject("sampledPositions", IOobject::MUST_READ)
     );
     c.checkFieldIOobject(c, sampledPositions);
 
-//    vectorIOFieldField sampleVelocity
+//    vectorFieldIOField sampleVelocity
 //    (
 //        c.fieldIOobject("sampleVelocity", IOobject::MUST_READ)
 //    );
@@ -428,12 +427,12 @@ void Foam::streamLineParticle::writeFields(const Cloud<streamLineParticle>& c)
         c.fieldIOobject("lifeTime", IOobject::NO_READ),
         np
     );
-    vectorIOFieldField sampledPositions
+    vectorFieldIOField sampledPositions
     (
         c.fieldIOobject("sampledPositions", IOobject::NO_READ),
         np
     );
-//    vectorIOFieldField sampleVelocity
+//    vectorFieldIOField sampleVelocity
 //    (
 //        c.fieldIOobject("sampleVelocity", IOobject::NO_READ),
 //        np

src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Description
-    vectorFieldField with IO.
-
-\*---------------------------------------------------------------------------*/
-
-#include "vectorIOFieldField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTemplateTypeNameAndDebugWithName
-    (
-        vectorIOFieldField,
-        "vectorFieldField",
-        0
-    );
-}
-
-// ************************************************************************* //

src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H

@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::vectorIOFieldField
-
-Description
-    vectorField with IO.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef vectorIOFieldField_H
-#define vectorIOFieldField_H
-
-#include "vectorField.H"
-#include "IOField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef IOField<vectorField> vectorIOFieldField;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C

@@ -248,10 +248,13 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
 {
     pointPatchField<vector>::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;

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

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

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

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

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

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

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;

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;

tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean

@@ -4,13 +4,13 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd wingFlutter_snappyHexMesh
+cd wingMotion_snappyHexMesh
 cleanCase
 
-cd ../wingFlutter2D_simpleFoam
+cd ../wingMotion2D_simpleFoam
 cleanCase
 
-cd ../wingFlutter2D_pimpleDyMFoam
+cd ../wingMotion2D_pimpleDyMFoam
 cleanCase
 rm -rf 0
 

tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun

@@ -5,22 +5,22 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Make 3D mesh in slab of cells.
-cd wingFlutter_snappyHexMesh
+cd wingMotion_snappyHexMesh
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
 # Make a 2D mesh by extruding a patch and solve to steady state.
-cd ../wingFlutter2D_simpleFoam
+cd ../wingMotion2D_simpleFoam
 runApplication extrudeMesh
 runApplication createPatch -overwrite
 runApplication simpleFoam
 
 # Copy the mesh from the steady state case and map the results to a
 # mesh motion case, then solve transient.
-cd ../wingFlutter2D_pimpleDyMFoam
-cp -r ../wingFlutter2D_simpleFoam/constant/polyMesh/* constant/polyMesh/
+cd ../wingMotion2D_pimpleDyMFoam
+cp -r ../wingMotion2D_simpleFoam/constant/polyMesh/* constant/polyMesh/
 cp -r 0.org 0
-runApplication mapFields ../wingFlutter2D_simpleFoam -sourceTime latestTime -consistent
+runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
 mv 0/pointDisplacement.unmapped 0/pointDisplacement
 runApplication decomposePar
 runParallel pimpleDyMFoam 3

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/extrudeProperties

@@ -18,7 +18,7 @@ FoamFile
 //      patch   : from patch of another case ('sourceCase')
 
 constructFrom patch;
-sourceCase "../wingFlutter_snappyHexMesh";
+sourceCase "../wingMotion_snappyHexMesh";
 sourcePatches (front);
 
 // If construct from patch: patch to use for back (can be same as sourcePatch)

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);
     }