diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C index 1cdd66490d576f5ecd8ee502c3bb065a0baae585..ac17397ad231c90b81ea1dff459fad60a686ac16 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshFeaturePoints.C @@ -301,8 +301,8 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating Foam::point pt1 = edgePt + s + ppDist*normal; Foam::point pt2 = edgePt - s + ppDist*normal; - Foam::point pt3 = reflectPointInPlane(pt1, facePlane); - Foam::point pt4 = reflectPointInPlane(pt2, facePlane); + Foam::point pt3 = facePlane.mirror(pt1); + Foam::point pt4 = facePlane.mirror(pt2); pts.append(Vb(pt1, Vb::vtInternalFeatureEdge)); pts.append(Vb(pt2, Vb::vtInternalFeatureEdge)); @@ -449,7 +449,7 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating if (masterPointReflectionsPrev.found(iter.key())) { const Foam::point reflectedPt = - reflectPointInPlane(pt, masterPointReflectionsPrev[iter.key()]); + masterPointReflectionsPrev[iter.key()].mirror(pt); // Info<< " Adding Prev " << reflectedPt << " " // << indexedVertexEnum::vertexTypeNames_[reflectedPtType] @@ -461,7 +461,7 @@ void Foam::conformalVoronoiMesh::createEdgePointGroupByCirculating if (masterPointReflectionsNext.found(iter.key())) { const Foam::point reflectedPt = - reflectPointInPlane(pt, masterPointReflectionsNext[iter.key()]); + masterPointReflectionsNext[iter.key()].mirror(pt); // Info<< " Adding Next " << reflectedPt << " " // << indexedVertexEnum::vertexTypeNames_[reflectedPtType] @@ -815,8 +815,8 @@ void Foam::conformalVoronoiMesh::createOpenEdgePointGroup Foam::point pt1 = edgePt + s + ppDist*n; Foam::point pt2 = edgePt - s + ppDist*n; - Foam::point pt3 = reflectPointInPlane(pt1, facePlane); - Foam::point pt4 = reflectPointInPlane(pt2, facePlane); + Foam::point pt3 = facePlane.mirror(pt1); + Foam::point pt4 = facePlane.mirror(pt2); pts.append(Vb(pt1, Vb::vtInternalSurface)); pts.append(Vb(pt2, Vb::vtInternalSurface)); @@ -1235,8 +1235,7 @@ void Foam::conformalVoronoiMesh::addMasterAndSlavePoints const plane& reflPlane = masterPointPlanes[planeI](); - const Foam::point slavePt = - reflectPointInPlane(masterPt, reflPlane); + const Foam::point slavePt = reflPlane.mirror(masterPt); // Info<< " Slave " << planeI << " = " << slavePt << endl; @@ -1717,27 +1716,9 @@ Foam::List<Foam::point> Foam::conformalVoronoiMesh::reflectPointInPlanes forAll(planes, planeI) { - reflectedPoints[planeI] = reflectPointInPlane(p, planes[planeI]()); + reflectedPoints[planeI] = planes[planeI]().mirror(p); } return reflectedPoints; } - -Foam::point Foam::conformalVoronoiMesh::reflectPointInPlane -( - const Foam::point p, - const plane& planeN -) const -{ - const vector reflectedPtDir = p - planeN.nearestPoint(p); - - if ((planeN.normal() & reflectedPtDir) > 0) - { - return p - 2.0*planeN.distance(p)*planeN.normal(); - } - else - { - return p + 2.0*planeN.distance(p)*planeN.normal(); - } -} diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C index 410b20b3875c9fc33ccdeaaa2af6466ab4e1ecea..fe4f649f1540bfaea4ffe65f6e5a4ecf3045d83a 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C +++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C @@ -447,6 +447,21 @@ Foam::plane::side Foam::plane::sideOfPlane(const point& p) const } +Foam::point Foam::plane::mirror(const point& p) const +{ + const vector mirroredPtDir = p - nearestPoint(p); + + if ((normal() & mirroredPtDir) > 0) + { + return p - 2.0*distance(p)*normal(); + } + else + { + return p + 2.0*distance(p)*normal(); + } +} + + void Foam::plane::writeDict(Ostream& os) const { os.writeKeyword("planeType") << "pointAndNormal" diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H index 3a47e6bf2ea0c9e0b7fdacfcd39885163cedaede..44564fa92a8c649bbe8a1fe2d7449bc3e7918a49 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H +++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H @@ -194,6 +194,9 @@ public: // If the point is on the plane, then returns NORMAL. side sideOfPlane(const point& p) const; + //- Mirror the supplied point in the plane. Return the mirrored point. + point mirror(const point& p) const; + //- Write to dictionary void writeDict(Ostream&) const; diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C index 2de3fab7e0e0a92d170e1e0be2bd354d62c1f027..c8d6c3fb9613fa2af0645f2965ce39300df76c44 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const { scalar t = time_.value(); - // Rotation around centre of gravity (in radians) + // Rotation origin (in radians) vector omega ( t*degToRad(radialVelocity_.x()), @@ -83,7 +83,7 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::transformation() const scalar magOmega = mag(omega); quaternion R(omega/magOmega, magOmega); - septernion TR(septernion(CofG_)*R*septernion(-CofG_)); + septernion TR(septernion(origin_)*R*septernion(-origin_)); Info<< "solidBodyMotionFunctions::axisRotationMotion::transformation(): " << "Time = " << t << " transformation: " << TR << endl; @@ -99,7 +99,7 @@ bool Foam::solidBodyMotionFunctions::axisRotationMotion::read { solidBodyMotionFunction::read(SBMFCoeffs); - SBMFCoeffs_.lookup("CofG") >> CofG_; + SBMFCoeffs_.lookup("origin") >> origin_; SBMFCoeffs_.lookup("radialVelocity") >> radialVelocity_; return true; diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H index d372d824804dd638797e804fded808c326beef9e..bc6b67936512c83294712de2980ed106eddddc25 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,8 +57,8 @@ class axisRotationMotion { // Private data - //- Centre of gravity - point CofG_; + //- Origin + point origin_; //- Rotational velocity (deg/s) vector radialVelocity_; diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C index d729963b396e3b5f39e73a9b8a76388f9707f1e6..11715cd93f296ea4b6a2263eaa3e62120e254242 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ transformation() const eulerAngles *= pi/180.0; quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); - septernion TR(septernion(CofG_)*R*septernion(-CofG_)); + septernion TR(septernion(origin_)*R*septernion(-origin_)); Info<< "solidBodyMotionFunctions::oscillatingRotatingMotion::" << "transformation(): " @@ -99,7 +99,7 @@ bool Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::read { solidBodyMotionFunction::read(SBMFCoeffs); - SBMFCoeffs_.lookup("CofG") >> CofG_; + SBMFCoeffs_.lookup("origin") >> origin_; SBMFCoeffs_.lookup("amplitude") >> amplitude_; SBMFCoeffs_.lookup("omega") >> omega_; diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H index e0737a8b4dedcf5bfaa142c9f9a66bc973e469c2..cbe10a95ecc2a186e1970855e3bdd9511902396f 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ class oscillatingRotatingMotion // Private data //- Centre of gravity - point CofG_; + point origin_; //- Amplitude vector amplitude_; diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C index 58e1faddc3b3df6890945a69968e4fadd7e772c0..7d716e687a7de66fdd1115666cb03bd156b19108 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,10 +54,11 @@ Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion const Time& runTime ) : - solidBodyMotionFunction(SBMFCoeffs, runTime) -{ - read(SBMFCoeffs); -} + solidBodyMotionFunction(SBMFCoeffs, runTime), + origin_(SBMFCoeffs_.lookup("origin")), + axis_(SBMFCoeffs_.lookup("axis")), + omega_(DataEntry<scalar>::New("omega", SBMFCoeffs_)) +{} // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * // @@ -73,16 +74,11 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const { scalar t = time_.value(); - // Motion around a centre of gravity - - // Rotation around centre of gravity (in degrees) - vector eulerAngles = radialVelocity_*t; - - // Convert the rotational motion from deg to rad - eulerAngles *= pi/180.0; + // Rotation around axis + vector eulerAngles = omega_->integrate(0, t)*axis_; quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); - septernion TR(septernion(CofG_)*R*septernion(-CofG_)); + septernion TR(septernion(origin_)*R*septernion(-origin_)); Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): " << "Time = " << t << " transformation: " << TR << endl; @@ -98,8 +94,10 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read { solidBodyMotionFunction::read(SBMFCoeffs); - SBMFCoeffs_.lookup("CofG") >> CofG_; - SBMFCoeffs_.lookup("radialVelocity") >> radialVelocity_; + omega_.reset + ( + DataEntry<scalar>::New("omega", SBMFCoeffs_).ptr() + ); return true; } diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H index 487f7ec726c881c07b4bb78e3c0941c9cc6f4997..87ec08746fb45af2ed36ca9059a8cd2c0f423f1f 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,8 +25,10 @@ Class Foam::solidBodyMotionFunctions::rotatingMotion Description - SolidBodyMotionFvMesh 6DoF motion function. Constant - velocity rotation around CoG. + SolidBodyMotionFvMesh 6DoF motion function. + + The rotation is defined by an origin and axis of rotation and an angular + speed. SourceFiles rotatingMotion.C @@ -39,6 +41,8 @@ SourceFiles #include "solidBodyMotionFunction.H" #include "primitiveFields.H" #include "point.H" +#include "DataEntry.H" +#include "autoPtr.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,11 +61,14 @@ class rotatingMotion { // Private data - //- Centre of gravity - point CofG_; + //- Origin of the axis + const vector origin_; + + //- Axis vector + const vector axis_; - //- Rotational velocity (deg/s) - vector radialVelocity_; + //- Angular velocty (rad/sec) + autoPtr<DataEntry<scalar> > omega_; // Private Member Functions diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C index 05c86b78833d8d5be4a7fb429769e5a40af76720..54ad050fc65d61a433e58d252cad002261320c48 100644 --- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C +++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C @@ -1386,17 +1386,11 @@ Foam::Istream& Foam::operator>> Foam::extendedFeatureEdgeMesh::sideVolumeType& vt ) { - // Read beginning of sideVolumeType - is.readBegin("sideVolumeType"); - - int type; + label type; is >> type; vt = static_cast<Foam::extendedFeatureEdgeMesh::sideVolumeType>(type); - // Read end of volumeType - is.readEnd("sideVolumeType"); - // Check state of Istream is.check("operator>>(Istream&, sideVolumeType&)"); @@ -1410,7 +1404,7 @@ Foam::Ostream& Foam::operator<< const Foam::extendedFeatureEdgeMesh::sideVolumeType& vt ) { - os << static_cast<int>(vt); + os << static_cast<label>(vt); return os; } diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings index fe14cc2204e53ffeceea6c576b024e8c3357d9c2..64cc638a67d252894fbd958eae00ac1734a75189 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/caseSettings @@ -33,7 +33,7 @@ outerInlet meshMotionProperties { - radialVelocity (0 0 1440); // deg/s + omega 25; // rad/s } #include "${FOAM_CASE}/constant/boundaryConditions" diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict index 4dc555992d5470e7f508e30558222b15fcae4323..91865a2a19915dd8163212aa4a5a209a75aefa15 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/dynamicMeshDict @@ -26,8 +26,9 @@ solidBodyMotionFvMeshCoeffs solidBodyMotionFunction rotatingMotion; rotatingMotionCoeffs { - CofG (0 0 0); - radialVelocity $:meshMotionProperties.radialVelocity; + origin (0 0 0); + axis (0 0 1); + omega $:meshMotionProperties.omega; } } diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh index 260540c8971dc351a627cec762b58604bdf56d2f..27d7e52827fcd5c6d4093221cf27f019a3cc7b6e 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/rotorBlades.eMesh @@ -20,6 +20,22 @@ FoamFile 104 ( +(0.0375 9.18455e-18 0.04) +(2.29614e-18 -0.0375 0.04) +(0.0125 3.06152e-18 0.04) +(-0.0375 -4.59227e-18 0.04) +(7.65379e-19 -0.0125 0.04) +(-6.88841e-18 0.0375 0.04) +(-0.0125 -1.53076e-18 0.04) +(0.0375 9.18455e-18 0.08) +(-2.29614e-18 0.0125 0.04) +(2.29614e-18 -0.0375 0.08) +(0.0125 3.06152e-18 0.08) +(-0.0375 -4.59227e-18 0.08) +(7.65379e-19 -0.0125 0.08) +(-6.88841e-18 0.0375 0.08) +(-0.0125 -1.53076e-18 0.08) +(-2.29614e-18 0.0125 0.08) (-6.88841e-18 0.0375 0.055) (-6.88841e-18 0.0375 0.06) (0.0375 9.18455e-18 0.065) @@ -62,65 +78,49 @@ FoamFile (0.0325 7.95994e-18 0.08) (-0.0375 -4.59227e-18 0.07) (7.65379e-19 -0.0125 0.07) -(0.0375 9.18455e-18 0.04) (0.0375 9.18455e-18 0.045) (1.98999e-18 -0.0325 0.08) (-6.88841e-18 0.0375 0.07) (0.0375 9.18455e-18 0.075) (-0.0125 -1.53076e-18 0.07) -(2.29614e-18 -0.0375 0.04) (2.29614e-18 -0.0375 0.045) -(0.0125 3.06152e-18 0.04) (0.0125 3.06152e-18 0.045) (0.0175 4.28612e-18 0.04) (-0.0325 -3.97997e-18 0.08) (2.29614e-18 -0.0375 0.075) (-2.29614e-18 0.0125 0.07) (0.0125 3.06152e-18 0.075) -(-0.0375 -4.59227e-18 0.04) (-0.0375 -4.59227e-18 0.045) -(7.65379e-19 -0.0125 0.04) (1.07153e-18 -0.0175 0.04) (7.65379e-19 -0.0125 0.045) (-5.96996e-18 0.0325 0.08) (-0.0375 -4.59227e-18 0.075) (7.65379e-19 -0.0125 0.075) -(-6.88841e-18 0.0375 0.04) (-6.88841e-18 0.0375 0.045) (0.0375 9.18455e-18 0.05) -(-0.0125 -1.53076e-18 0.04) (-0.0175 -2.14306e-18 0.04) (-0.0125 -1.53076e-18 0.045) (-6.88841e-18 0.0375 0.075) -(0.0375 9.18455e-18 0.08) (-0.0125 -1.53076e-18 0.075) (2.29614e-18 -0.0375 0.05) -(-2.29614e-18 0.0125 0.04) (-3.21459e-18 0.0175 0.04) (-2.29614e-18 0.0125 0.045) (0.0125 3.06152e-18 0.05) -(2.29614e-18 -0.0375 0.08) (-2.29614e-18 0.0125 0.075) -(0.0125 3.06152e-18 0.08) (0.0175 4.28612e-18 0.08) (-0.0375 -4.59227e-18 0.05) (7.65379e-19 -0.0125 0.05) (0.0225 5.51073e-18 0.04) -(-0.0375 -4.59227e-18 0.08) -(7.65379e-19 -0.0125 0.08) (1.07153e-18 -0.0175 0.08) (-6.88841e-18 0.0375 0.05) (0.0375 9.18455e-18 0.055) (-0.0125 -1.53076e-18 0.05) (1.37768e-18 -0.0225 0.04) -(-6.88841e-18 0.0375 0.08) -(-0.0125 -1.53076e-18 0.08) (-0.0175 -2.14306e-18 0.08) (2.29614e-18 -0.0375 0.055) (-2.29614e-18 0.0125 0.05) (0.0125 3.06152e-18 0.055) (-0.0225 -2.75536e-18 0.04) -(-2.29614e-18 0.0125 0.08) (-3.21459e-18 0.0175 0.08) (-0.0375 -4.59227e-18 0.055) (7.65379e-19 -0.0125 0.055) @@ -131,110 +131,110 @@ FoamFile 104 ( -(0 1) -(2 3) -(4 5) -(6 7) -(8 9) -(10 11) -(12 13) -(14 15) (16 17) (18 19) (20 21) (22 23) (24 25) (26 27) -(1 28) -(29 2) -(30 4) -(31 32) -(33 34) -(11 35) -(36 12) -(15 37) -(7 38) -(9 39) -(21 40) -(41 22) -(42 16) -(43 42) -(44 18) -(28 45) -(46 29) -(47 30) -(25 48) -(48 49) -(50 51) -(52 50) -(53 26) -(35 54) -(55 36) +(28 29) +(30 31) +(32 33) +(34 35) +(36 37) +(38 39) +(40 41) +(42 43) +(17 44) +(45 18) +(46 20) +(47 48) +(49 50) +(27 51) +(52 28) +(31 53) +(23 54) +(25 55) (37 56) -(32 57) -(57 58) -(59 60) -(61 59) -(62 33) -(40 63) -(64 41) -(38 65) -(65 66) -(67 43) -(68 69) -(70 68) -(45 71) -(72 46) -(39 72) -(73 47) -(49 74) -(75 76) -(77 75) -(51 78) -(79 44) -(54 79) -(80 55) -(56 81) -(81 82) -(58 83) -(84 61) -(85 52) -(86 53) -(63 86) -(87 64) -(88 87) -(66 89) -(90 67) -(91 70) -(60 92) -(93 62) -(71 93) -(94 73) -(95 94) -(74 96) -(97 77) -(78 98) -(69 99) -(100 80) -(101 100) -(83 102) -(103 84) -(76 6) -(82 8) -(89 0) -(3 90) -(5 91) -(17 85) -(19 88) -(96 10) -(13 97) -(98 14) -(92 24) -(27 95) -(102 20) -(23 103) -(99 31) -(34 101) +(57 38) +(0 32) +(58 0) +(59 34) +(44 60) +(61 45) +(62 46) +(41 1) +(1 63) +(2 64) +(65 2) +(66 42) +(51 67) +(68 52) +(53 69) +(48 3) +(3 70) +(4 71) +(72 4) +(73 49) +(56 74) +(75 57) +(54 5) +(5 76) +(77 58) +(6 78) +(79 6) +(60 80) +(7 61) +(55 7) +(81 62) +(63 82) +(8 83) +(84 8) +(64 85) +(9 59) +(67 9) +(86 68) +(69 10) +(10 87) +(70 88) +(89 72) +(90 65) +(11 66) +(74 11) +(12 75) +(91 12) +(76 92) +(93 77) +(94 79) +(71 95) +(13 73) +(80 13) +(14 81) +(96 14) +(82 97) +(98 84) +(85 99) +(78 100) +(15 86) +(101 15) +(88 102) +(103 89) +(83 22) +(87 24) +(92 16) +(19 93) +(21 94) +(33 90) +(35 91) +(97 26) +(29 98) +(99 30) +(95 40) +(43 96) +(102 36) +(39 103) +(100 47) +(50 101) ) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh index ddb196a8a2bde4aad0164e34ffe9ce0c856ab9c9..b60c3443dafec62575da5a7ed59e7fea59b401ae 100644 --- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh +++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/triSurface/statorBlades.eMesh @@ -20,6 +20,22 @@ FoamFile 352 ( +(0.08 1.95937e-17 0) +(4.89843e-18 -0.08 0) +(-0.08 -9.79685e-18 0) +(-1.46953e-17 0.08 0) +(0.1 2.44921e-17 0) +(6.12303e-18 -0.1 0) +(-0.1 -1.22461e-17 0) +(-1.83691e-17 0.1 0) +(0.08 1.95937e-17 0.2) +(4.89843e-18 -0.08 0.2) +(-0.08 -9.79685e-18 0.2) +(-1.46953e-17 0.08 0.2) +(0.1 2.44921e-17 0.2) +(6.12303e-18 -0.1 0.2) +(-0.1 -1.22461e-17 0.2) +(-1.83691e-17 0.1 0.2) (-1.83691e-17 0.1 0.13) (-1.83691e-17 0.1 0.135) (0.08 1.95937e-17 0.065) @@ -148,23 +164,19 @@ FoamFile (-0.1 -1.22461e-17 0.14) (-1.83691e-17 0.1 0.065) (-1.83691e-17 0.1 0.07) -(0.08 1.95937e-17 0) (0.08 1.95937e-17 0.005) (0.085 2.08183e-17 0) (-1.83691e-17 0.1 0.14) (0.08 1.95937e-17 0.075) -(4.89843e-18 -0.08 0) (5.20458e-18 -0.085 0) (4.89843e-18 -0.08 0.005) (0.08 1.95937e-17 0.145) (4.89843e-18 -0.08 0.075) -(-0.08 -9.79685e-18 0) (-0.085 -1.04092e-17 0) (-0.08 -9.79685e-18 0.005) (4.89843e-18 -0.08 0.145) (0.1 2.44921e-17 0.025) (-0.08 -9.79685e-18 0.075) -(-1.46953e-17 0.08 0) (-1.56137e-17 0.085 0) (-1.46953e-17 0.08 0.005) (0.1 2.44921e-17 0.095) @@ -218,24 +230,20 @@ FoamFile (4.89843e-18 -0.08 0.055) (0.08 1.95937e-17 0.195) (4.89843e-18 -0.08 0.125) -(0.1 2.44921e-17 0) (0.1 2.44921e-17 0.005) (-0.08 -9.79685e-18 0.055) (4.89843e-18 -0.08 0.195) (0.1 2.44921e-17 0.075) (-0.08 -9.79685e-18 0.125) -(6.12303e-18 -0.1 0) (6.12303e-18 -0.1 0.005) (-1.46953e-17 0.08 0.055) (0.1 2.44921e-17 0.145) (-0.08 -9.79685e-18 0.195) (6.12303e-18 -0.1 0.075) -(-0.1 -1.22461e-17 0) (-0.1 -1.22461e-17 0.005) (-1.46953e-17 0.08 0.125) (6.12303e-18 -0.1 0.145) (-0.1 -1.22461e-17 0.075) -(-1.83691e-17 0.1 0) (-1.83691e-17 0.1 0.005) (-1.46953e-17 0.08 0.195) (-0.1 -1.22461e-17 0.145) @@ -292,14 +300,11 @@ FoamFile (-1.83691e-17 0.1 0.195) (0.08 1.95937e-17 0.13) (4.89843e-18 -0.08 0.06) -(0.08 1.95937e-17 0.2) (0.085 2.08183e-17 0.2) (4.89843e-18 -0.08 0.13) -(4.89843e-18 -0.08 0.2) (5.20458e-18 -0.085 0.2) (0.1 2.44921e-17 0.01) (-0.08 -9.79685e-18 0.06) -(-0.08 -9.79685e-18 0.2) (-0.085 -1.04092e-17 0.2) (0.1 2.44921e-17 0.08) (-0.08 -9.79685e-18 0.13) @@ -307,7 +312,6 @@ FoamFile (-1.46953e-17 0.08 0.06) (0.1 2.44921e-17 0.15) (6.12303e-18 -0.1 0.08) -(-1.46953e-17 0.08 0.2) (-1.56137e-17 0.085 0.2) (-0.1 -1.22461e-17 0.01) (-1.46953e-17 0.08 0.13) @@ -346,14 +350,10 @@ FoamFile (6.12303e-18 -0.1 0.175) (-0.1 -1.22461e-17 0.105) (-1.83691e-17 0.1 0.035) -(0.1 2.44921e-17 0.2) (-0.1 -1.22461e-17 0.175) -(6.12303e-18 -0.1 0.2) (-1.83691e-17 0.1 0.105) (0.08 1.95937e-17 0.04) -(-0.1 -1.22461e-17 0.2) (-1.83691e-17 0.1 0.175) -(-1.83691e-17 0.1 0.2) (0.08 1.95937e-17 0.11) (4.89843e-18 -0.08 0.04) (0.08 1.95937e-17 0.18) @@ -379,14 +379,6 @@ FoamFile 352 ( -(0 1) -(2 3) -(4 5) -(6 7) -(8 9) -(10 11) -(12 13) -(14 15) (16 17) (18 19) (20 21) @@ -444,293 +436,301 @@ FoamFile (124 125) (126 127) (128 129) -(130 128) -(1 131) -(3 132) -(133 134) -(135 133) -(5 136) -(137 6) +(130 131) +(132 133) +(134 135) +(136 137) (138 139) -(140 138) -(141 8) -(142 10) -(143 12) -(144 145) -(146 144) -(147 14) -(148 16) -(19 149) -(150 20) +(140 141) +(142 143) +(0 144) +(145 0) +(17 146) +(19 147) +(1 148) +(149 1) +(21 150) (151 22) -(25 152) -(27 153) -(154 28) -(155 130) -(31 156) -(33 157) -(35 158) -(37 159) -(39 160) -(134 161) -(41 162) -(43 163) -(45 164) -(139 165) -(166 46) -(49 167) -(168 50) -(145 169) -(170 52) -(171 54) -(172 56) -(173 58) -(174 60) -(175 155) -(176 62) -(177 64) -(67 178) -(179 68) -(180 70) -(73 181) -(75 182) -(161 183) -(184 76) -(79 185) -(81 186) -(83 187) -(85 188) -(165 189) -(87 190) -(89 191) -(91 192) -(93 193) -(169 194) -(195 94) -(97 196) -(197 98) -(198 175) -(199 198) -(200 100) -(201 102) -(202 104) -(203 106) -(183 204) -(204 205) -(206 108) +(2 152) +(153 2) +(154 24) +(155 26) +(156 28) +(3 157) +(158 3) +(159 30) +(160 32) +(35 161) +(162 36) +(163 38) +(41 164) +(43 165) +(166 44) +(167 145) +(47 168) +(49 169) +(51 170) +(53 171) +(55 172) +(148 173) +(57 174) +(59 175) +(61 176) +(152 177) +(178 62) +(65 179) +(180 66) +(157 181) +(182 68) +(183 70) +(184 72) +(185 74) +(186 76) +(187 167) +(188 78) +(189 80) +(83 190) +(191 84) +(192 86) +(89 193) +(91 194) +(173 195) +(196 92) +(95 197) +(97 198) +(99 199) +(101 200) +(177 201) +(103 202) +(105 203) +(107 204) +(109 205) +(181 206) (207 110) -(208 112) -(115 209) -(189 210) -(210 211) -(212 116) -(119 213) -(121 214) -(194 215) -(215 216) -(217 122) -(125 218) -(127 219) -(129 220) -(131 221) -(132 222) -(223 135) -(136 224) -(225 137) -(226 140) -(227 141) -(228 142) -(229 143) -(230 146) -(231 147) -(232 148) -(149 233) -(234 150) -(235 151) -(152 236) -(153 237) -(238 154) -(156 239) -(157 240) -(158 241) -(159 242) -(160 243) -(162 244) -(163 245) -(164 246) -(247 166) -(167 248) -(249 168) -(250 170) -(251 171) -(252 172) -(253 173) -(254 174) -(255 176) -(256 177) -(178 257) -(258 179) -(259 180) -(181 260) -(182 261) -(262 184) -(185 263) -(186 264) -(187 265) -(188 266) -(190 267) -(191 268) -(192 269) -(193 270) -(271 195) -(196 272) -(272 273) -(274 197) -(275 201) -(276 275) -(277 199) -(278 200) -(279 208) -(280 279) -(281 202) -(282 203) -(205 283) -(284 206) -(285 207) -(209 286) -(287 217) -(288 287) -(211 289) -(290 212) -(213 291) -(214 292) -(273 293) -(216 294) -(218 295) -(296 276) -(219 297) -(220 298) -(221 299) -(300 280) -(222 301) -(302 223) -(224 303) -(304 288) -(305 225) -(293 306) -(307 226) -(308 227) -(309 228) -(310 229) -(311 296) -(312 230) -(313 231) -(314 232) -(233 315) -(316 300) -(317 234) -(318 235) -(236 319) -(237 320) -(321 304) -(322 238) -(239 323) -(240 324) -(241 325) -(326 259) -(306 326) -(242 327) -(328 311) -(263 328) -(243 329) -(244 330) -(331 316) -(266 331) -(245 332) -(333 321) -(269 333) -(246 334) -(335 247) -(248 336) -(337 249) -(338 250) -(339 251) -(340 252) -(341 253) -(342 254) -(343 255) -(344 256) -(257 345) -(346 258) -(260 347) -(261 348) -(349 262) -(264 350) -(265 351) -(267 0) -(268 2) -(270 4) -(7 271) -(9 274) -(11 277) -(13 278) -(15 281) -(17 282) -(283 18) -(21 284) -(23 285) -(286 24) -(289 26) -(29 290) -(291 30) -(292 32) -(294 34) -(295 36) -(297 38) -(298 40) -(299 42) -(301 44) -(47 302) -(303 48) -(51 305) -(53 307) -(55 308) -(57 309) -(59 310) -(61 312) -(63 313) -(65 314) -(315 66) -(69 317) -(71 318) -(319 72) -(320 74) -(77 322) -(323 78) -(324 80) -(325 82) -(327 84) -(329 86) -(330 88) -(332 90) -(334 92) -(95 335) -(336 96) -(99 337) -(101 338) -(103 339) -(105 340) -(107 341) -(109 342) -(111 343) -(113 344) -(345 114) -(117 346) -(347 118) -(348 120) -(123 349) -(350 124) -(351 126) +(113 208) +(209 114) +(4 187) +(210 4) +(211 116) +(212 118) +(213 120) +(214 122) +(195 5) +(5 215) +(216 124) +(217 126) +(218 128) +(131 219) +(201 6) +(6 220) +(221 132) +(135 222) +(137 223) +(206 7) +(7 224) +(225 138) +(141 226) +(143 227) +(144 228) +(146 229) +(147 230) +(231 149) +(150 232) +(233 151) +(234 153) +(235 154) +(236 155) +(237 156) +(238 158) +(239 159) +(240 160) +(161 241) +(242 162) +(243 163) +(164 244) +(165 245) +(246 166) +(168 247) +(169 248) +(170 249) +(171 250) +(172 251) +(174 252) +(175 253) +(176 254) +(255 178) +(179 256) +(257 180) +(258 182) +(259 183) +(260 184) +(261 185) +(262 186) +(263 188) +(264 189) +(190 265) +(266 191) +(267 192) +(193 268) +(194 269) +(270 196) +(197 271) +(198 272) +(199 273) +(200 274) +(202 275) +(203 276) +(204 277) +(205 278) +(279 207) +(208 8) +(8 280) +(281 209) +(9 212) +(282 9) +(283 210) +(284 211) +(10 218) +(285 10) +(286 213) +(287 214) +(215 288) +(289 216) +(290 217) +(219 291) +(11 225) +(292 11) +(220 293) +(294 221) +(222 295) +(223 296) +(280 297) +(224 298) +(226 299) +(300 282) +(227 301) +(228 302) +(229 303) +(304 285) +(230 305) +(306 231) +(232 307) +(308 292) +(309 233) +(297 310) +(311 234) +(312 235) +(313 236) +(314 237) +(315 300) +(316 238) +(317 239) +(318 240) +(241 319) +(320 304) +(321 242) +(322 243) +(244 323) +(245 324) +(325 308) +(326 246) +(247 327) +(248 328) +(249 329) +(12 267) +(310 12) +(250 330) +(13 315) +(271 13) +(251 331) +(252 332) +(14 320) +(274 14) +(253 333) +(15 325) +(277 15) +(254 334) +(335 255) +(256 336) +(337 257) +(338 258) +(339 259) +(340 260) +(341 261) +(342 262) +(343 263) +(344 264) +(265 345) +(346 266) +(268 347) +(269 348) +(349 270) +(272 350) +(273 351) +(275 16) +(276 18) +(278 20) +(23 279) +(25 281) +(27 283) +(29 284) +(31 286) +(33 287) +(288 34) +(37 289) +(39 290) +(291 40) +(293 42) +(45 294) +(295 46) +(296 48) +(298 50) +(299 52) +(301 54) +(302 56) +(303 58) +(305 60) +(63 306) +(307 64) +(67 309) +(69 311) +(71 312) +(73 313) +(75 314) +(77 316) +(79 317) +(81 318) +(319 82) +(85 321) +(87 322) +(323 88) +(324 90) +(93 326) +(327 94) +(328 96) +(329 98) +(330 100) +(331 102) +(332 104) +(333 106) +(334 108) +(111 335) +(336 112) +(115 337) +(117 338) +(119 339) +(121 340) +(123 341) +(125 342) +(127 343) +(129 344) +(345 130) +(133 346) +(347 134) +(348 136) +(139 349) +(350 140) +(351 142) ) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict index 1df8467c2e836d5f319737c5f511d6557bb9c921..6536aa4658aa113af084b89f6d683df9919dc596 100644 --- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict @@ -26,8 +26,9 @@ solidBodyMotionFvMeshCoeffs solidBodyMotionFunction rotatingMotion; rotatingMotionCoeffs { - CofG (0 0 0); - radialVelocity (0 0 360); // deg/s + origin (0 0 0); + axis (0 0 1); + omega 6.2832; // rad/s } } diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict index a657902851b89fcbb1c3404b12acf247ef74667f..8bbe66192672c52aeb8abf0405e1b95f2526c76d 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/dynamicMeshDict @@ -26,8 +26,9 @@ solidBodyMotionFvMeshCoeffs solidBodyMotionFunction rotatingMotion; rotatingMotionCoeffs { - CofG (0 0 0); - radialVelocity (0 9000 0); // deg/s + origin (0 0 0); + axis (0 1 0); + omega 158; // rad/s } } diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict index fe6a5fdb95266d27dddf97d4e6874119c7de369d..9800c48df474b11a98dc8852ce9527d6072a4855 100644 --- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/dynamicMeshDict @@ -26,8 +26,9 @@ solidBodyMotionFvMeshCoeffs solidBodyMotionFunction rotatingMotion; rotatingMotionCoeffs { - CofG (0 0 0); - radialVelocity (0 0 -288); // deg/s -> 5 rad/s -> 48 rpm + origin (0 0 0); + axis (0 0 1); + omega -5; // 5 rad/s } } diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict index 205dae9311082ab85377d063f757d6a197b9c89e..c6fa67e32640901a6fc815f49cecffe83526765b 100644 --- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/dynamicMeshDict @@ -29,8 +29,9 @@ solidBodyMotionFvMeshCoeffs solidBodyMotionFunction rotatingMotion; rotatingMotionCoeffs { - CofG (0 0.1 0); - radialVelocity (0 0 360); // degrees/s + origin (0 0.1 0); + axis (0 0 1); + omega 6.2832; // rad/s } } @@ -40,17 +41,19 @@ solidBodyMotionFvMeshCoeffs // solidBodyMotionFunction rotatingMotion; // rotatingMotionCoeffs // { - // CofG (0 0 0); - // radialVelocity (720 0 0); // degrees/s + // origin (0 0 0); + // axis (1 0 0); + // omega 12.5664; // rad/s // } //} + // Tube rocking on rotating table rotatingBox { solidBodyMotionFunction oscillatingRotatingMotion; oscillatingRotatingMotionCoeffs { - CofG (0 0 0); + origin (0 0 0); omega 40; // rad/s amplitude (45 0 0); // 45 degrees max tilt }