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/field/Make/files b/src/postProcessing/functionObjects/field/Make/files index df93e62853..003ef04ef8 100644 --- a/src/postProcessing/functionObjects/field/Make/files +++ b/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 diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C index ed702f489a..1d874d3889 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C +++ b/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& 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& 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 diff --git a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C deleted file mode 100644 index 7ecd4d86a2..0000000000 --- a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.C +++ /dev/null @@ -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 . - -Description - vectorFieldField with IO. - -\*---------------------------------------------------------------------------*/ - -#include "vectorIOFieldField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - defineTemplateTypeNameAndDebugWithName - ( - vectorIOFieldField, - "vectorFieldField", - 0 - ); -} - -// ************************************************************************* // diff --git a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H b/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H deleted file mode 100644 index b57b7813fd..0000000000 --- a/src/postProcessing/functionObjects/field/streamLine/vectorIOFieldField.H +++ /dev/null @@ -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 . - -Typedef - Foam::vectorIOFieldField - -Description - vectorField with IO. - -\*---------------------------------------------------------------------------*/ - -#ifndef vectorIOFieldField_H -#define vectorIOFieldField_H - -#include "vectorField.H" -#include "IOField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - typedef IOField vectorIOFieldField; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // 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/incompressible/pimpleDyMFoam/wingFlutter/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean similarity index 65% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/Allclean rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean index daafdf90aa..9d22504b6e 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/Allclean +++ b/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 diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/Allrun b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun similarity index 74% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/Allrun rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun index 23f224782e..aab4860421 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/Allrun +++ b/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 diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/U rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/U diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/fixedInlet rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/fixedInlet diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/include/initialConditions rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/include/initialConditions diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/k rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/k diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/nut b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/nut rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/omega rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/omega diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/p rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/p diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/pointDisplacement b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/0.org/pointDisplacement rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/RASProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/RASProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/dynamicMeshDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/polyMesh/boundary rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/transportProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/constant/turbulenceProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/turbulenceProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/controlDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/controlDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/decomposeParDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSchemes rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_pimpleDyMFoam/system/fvSolution rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/U similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/U rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/U diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/fixedInlet rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/fixedInlet diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/include/initialConditions rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/include/initialConditions diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/k similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/k rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/k diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/nut b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/nut similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/nut rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/nut diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/omega similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/omega rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/omega diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/p similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/0/p rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/0/p diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/RASProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/RASProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/RASProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/extrudeProperties similarity index 97% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/extrudeProperties index bbb18ba9e6..b66ea24bc4 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/extrudeProperties +++ b/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) diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/polyMesh/boundary rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/constant/transportProperties rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/controlDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/createPatchDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSchemes rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter2D_simpleFoam/system/fvSolution rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/blockMeshDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/blockMeshDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/polyMesh/boundary rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/triSurface/wing_5degrees.obj b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/constant/triSurface/wing_5degrees.obj rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/triSurface/wing_5degrees.obj diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/controlDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/controlDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/decomposeParDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/decomposeParDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/decomposeParDict diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/fvSchemes rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/fvSolution rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSolution diff --git a/tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict similarity index 100% rename from tutorials/incompressible/pimpleDyMFoam/wingFlutter/wingFlutter_snappyHexMesh/system/snappyHexMeshDict rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict 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); }