diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options index d00a68c64b..2a5429f7a8 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options @@ -26,5 +26,4 @@ EXE_LIBS = \ -ltopoChangerFvMesh \ -lmeshTools \ -lfvOptions \ - -lsampling \ - -lsixDoFRigidBodyMotion + -lsampling diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H b/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H deleted file mode 100644 index 3790bf9bb9..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/packingLimiter.H +++ /dev/null @@ -1,36 +0,0 @@ - if (packingLimiter) - { - // Calculating exceeding volume fractions - volScalarField alphaEx(max(alpha1 - alphaMax, scalar(0))); - - // Finding neighbouring cells of the whole domain - labelListList neighbour = mesh.cellCells(); - scalarField cellVolumes(mesh.cellVolumes()); - - forAll (alphaEx, celli) - { - // Finding the labels of the neighbouring cells - labelList neighbourCell = neighbour[celli]; - - // Initializing neighbouring cells contribution - scalar neighboursEx = 0.0; - - forAll (neighbourCell, cellj) - { - labelList neighboursNeighbour = neighbour[neighbourCell[cellj]]; - scalar neighboursNeighbourCellVolumes = 0.0; - - forAll (neighboursNeighbour, cellk) - { - neighboursNeighbourCellVolumes += - cellVolumes[neighboursNeighbour[cellk]]; - } - - neighboursEx += - alphaEx[neighbourCell[cellj]]*cellVolumes[celli] - /neighboursNeighbourCellVolumes; - } - - alpha1[celli] += neighboursEx - alphaEx[celli]; - } - } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H deleted file mode 100644 index 3acbf758d0..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/readPPProperties.H +++ /dev/null @@ -1,36 +0,0 @@ - IOdictionary ppProperties - ( - IOobject - ( - "ppProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - scalar preAlphaExp - ( - readScalar(ppProperties.lookup("preAlphaExp")) - ); - - scalar alphaMax - ( - readScalar(ppProperties.lookup("alphaMax")) - ); - - scalar expMax - ( - readScalar(ppProperties.lookup("expMax")) - ); - - dimensionedScalar g0 - ( - ppProperties.lookup("g0") - ); - - Switch packingLimiter - ( - ppProperties.lookup("packingLimiter") - ); diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict index 9f7f37d1b1..588908550c 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict @@ -418,9 +418,9 @@ addLayersControls // default is 0. //nSmoothDisplacement 90; - // Optional: do not extrude any point where all surrounding faces - // have at least one point not extruded. Default is true. - //detectExtrusionIsland false; + // (wip)Optional: do not extrude a point if none of the surrounding points is + // not extruded. Default is false. + //detectExtrusionIsland true; // Mesh shrinking @@ -488,7 +488,9 @@ meshQualityControls //( // mesh // write intermediate meshes // intersections // write current mesh intersections as .obj files -// featureSeeds // write information about explicit feature edge refinement +// featureSeeds // write information about explicit feature edge +// // refinement +// attraction // write attraction as .obj files // layerInfo // write information about layers //); // diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C index 02ba442f2e..0f93713246 100644 --- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C +++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ void writeWeights(const polyMesh& mesh) ( ami.tgtWeightsSum(), cpp.neighbPatch(), - "output", + "postProcessing", "tgt", tmName ); @@ -98,7 +98,7 @@ void writeWeights(const polyMesh& mesh) ( ami.srcWeightsSum(), cpp, - "output", + "postProcessing", "src", tmName ); diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C index bd58fe39a9..7f04d5877d 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -141,7 +141,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols forAll(cellCtrs, celli) { - if (cellVols[celli] > VSMALL) + if (mag(cellVols[celli]) > VSMALL) { cellCtrs[celli] /= cellVols[celli]; } diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index 8b86b71247..de74bbbcca 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ Description #include "mapPolyMesh.H" #include "addPatchCellLayer.H" #include "mapDistributePolyMesh.H" -#include "OFstream.H" +#include "OBJstream.H" #include "layerParameters.H" #include "combineFaces.H" #include "IOmanip.H" @@ -80,37 +80,25 @@ void Foam::autoLayerDriver::dumpDisplacement const List& extrudeStatus ) { - OFstream dispStr(prefix + "_disp.obj"); + OBJstream dispStr(prefix + "_disp.obj"); Info<< "Writing all displacements to " << dispStr.name() << endl; - label vertI = 0; - forAll(patchDisp, patchPointI) { const point& pt = pp.localPoints()[patchPointI]; - - meshTools::writeOBJ(dispStr, pt); vertI++; - meshTools::writeOBJ(dispStr, pt + patchDisp[patchPointI]); vertI++; - - dispStr << "l " << vertI-1 << ' ' << vertI << nl; + dispStr.write(linePointRef(pt, pt + patchDisp[patchPointI])); } - OFstream illStr(prefix + "_illegal.obj"); + OBJstream illStr(prefix + "_illegal.obj"); Info<< "Writing invalid displacements to " << illStr.name() << endl; - vertI = 0; - forAll(patchDisp, patchPointI) { if (extrudeStatus[patchPointI] != EXTRUDE) { const point& pt = pp.localPoints()[patchPointI]; - - meshTools::writeOBJ(illStr, pt); vertI++; - meshTools::writeOBJ(illStr, pt + patchDisp[patchPointI]); vertI++; - - illStr << "l " << vertI-1 << ' ' << vertI << nl; + illStr.write(linePointRef(pt, pt + patchDisp[patchPointI])); } } } @@ -441,13 +429,12 @@ void Foam::autoLayerDriver::handleFeatureAngle point::max // null value ); - label vertI = 0; - autoPtr str; + autoPtr str; if (debug&meshRefinement::MESH) { str.reset ( - new OFstream + new OBJstream ( mesh.time().path() / "featureEdges_" @@ -497,11 +484,9 @@ void Foam::autoLayerDriver::handleFeatureAngle if (str.valid()) { - meshTools::writeOBJ(str(), pp.localPoints()[e[0]]); - vertI++; - meshTools::writeOBJ(str(), pp.localPoints()[e[1]]); - vertI++; - str()<< "l " << vertI-1 << ' ' << vertI << nl; + const point& p0 = pp.localPoints()[e[0]]; + const point& p1 = pp.localPoints()[e[1]]; + str().write(linePointRef(p0, p1)); } } } @@ -1542,7 +1527,7 @@ void Foam::autoLayerDriver::getPatchDisplacement if (!meshTools::visNormal(n, faceNormals, pointFaces[patchPointI])) { - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { Pout<< "No valid normal for point " << meshPointI << ' ' << pp.points()[meshPointI] @@ -1582,7 +1567,7 @@ void Foam::autoLayerDriver::getPatchDisplacement if (nPoints > 0) { - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { Pout<< "Displacement at illegal point " << localPoints[patchPointI] diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C index 1f1464d96e..48fcdbbb06 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine ( meshRefiner_.refineCandidates ( - refineParams.keepPoints()[0], // For now only use one. + refineParams.keepPoints(), refineParams.curvature(), refineParams.planarAngle(), @@ -207,7 +207,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine ( meshRefiner_.refineCandidates ( - refineParams.keepPoints()[0], + refineParams.keepPoints(), refineParams.curvature(), refineParams.planarAngle(), @@ -341,7 +341,7 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine ( meshRefiner_.refineCandidates ( - refineParams.keepPoints()[0], + refineParams.keepPoints(), refineParams.curvature(), refineParams.planarAngle(), @@ -753,7 +753,7 @@ Foam::label Foam::autoRefineDriver::shellRefine ( meshRefiner_.refineCandidates ( - refineParams.keepPoints()[0], + refineParams.keepPoints(), refineParams.curvature(), refineParams.planarAngle(), diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C index 4652944253..e810b198f4 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C @@ -1279,7 +1279,7 @@ void Foam::autoSnapDriver::detectNearSurfaces autoPtr gapStr; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { gapStr.reset ( @@ -3089,7 +3089,7 @@ void Foam::autoSnapDriver::doSnap meshMover.setDisplacement(disp); - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { dumpMove ( @@ -3120,13 +3120,6 @@ void Foam::autoSnapDriver::doSnap << " surfaces but the" << " resulting mesh will not satisfy your quality" << " constraints" << nl << endl; - //Info<< "Did not succesfully snap mesh. Giving up." - // << nl << endl; - // - //// Use current mesh as base mesh - //meshMover.correct(); - // - //break; } if (debug&meshRefinement::MESH) diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C index 4b2a17b69a..c7a00df00e 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C @@ -422,7 +422,7 @@ void Foam::autoSnapDriver::calcNearestFace ^ faceSurfaceNormal[faceI]; } - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { dumpMove ( @@ -1037,7 +1037,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction { autoPtr feStr; autoPtr fpStr; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { feStr.reset ( @@ -1331,7 +1331,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch ) const { autoPtr multiPatchStr; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { multiPatchStr.reset ( @@ -1809,7 +1809,7 @@ void Foam::autoSnapDriver::determineFeatures autoPtr missedEdgeStr; autoPtr featurePointStr; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { featureEdgeStr.reset ( @@ -2263,7 +2263,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures autoPtr baffleEdgeStr; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { baffleEdgeStr.reset ( @@ -2865,7 +2865,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges // Dump - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { OBJstream featureEdgeStr ( @@ -2962,7 +2962,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges ); } - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { dumpMove ( @@ -3380,7 +3380,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature // Re-add normal component tangPatchDisp += (pointNormals & patchDisp) * pointNormals; - if (debug&meshRefinement::OBJINTERSECTIONS) + if (debug&meshRefinement::ATTRACTION) { dumpMove ( diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C index 8d41eebd25..7bb803ef66 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,13 +67,14 @@ namespace Foam const char* Foam::NamedEnum < Foam::meshRefinement::IOdebugType, - 4 + 5 >::names[] = { "mesh", //"scalarLevels", "intersections", "featureSeeds", + "attraction", "layerInfo" }; @@ -102,7 +103,7 @@ namespace Foam } -const Foam::NamedEnum +const Foam::NamedEnum Foam::meshRefinement::IOdebugTypeNames; const Foam::NamedEnum diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H index 3855caef18..78b7d9a1a1 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.H @@ -92,15 +92,17 @@ public: //IOSCALARLEVELS, IOOBJINTERSECTIONS, IOFEATURESEEDS, + IOATTRACTION, IOLAYERINFO }; - static const NamedEnum IOdebugTypeNames; + static const NamedEnum IOdebugTypeNames; enum debugType { MESH = 1< 0) - { - label e0 = pointEdges[pointI][0]; - label regionI = edgeRegion[e0]; - regionVisited[regionI] = 1u; + // Mark + if (pointEdges[pointI].size() > 0) + { + label e0 = pointEdges[pointI][0]; + label regionI = edgeRegion[e0]; + regionVisited[regionI] = 1u; + } } } - } - // 2. Any regions that have not been visited at all? These can - // only be circular regions! - forAll(featureMesh.edges(), edgeI) - { - if (regionVisited.set(edgeRegion[edgeI], 1u)) + // 2. Any regions that have not been visited at all? These can + // only be circular regions! + forAll(featureMesh.edges(), edgeI) { - const edge& e = featureMesh.edges()[edgeI]; - label pointI = e.start(); - if (debug&meshRefinement::FEATURESEEDS) + if (regionVisited.set(edgeRegion[edgeI], 1u)) { - Pout<< "Adding particle from point:" << pointI - << " coord:" << featureMesh.points()[pointI] - << " on circular region:" << edgeRegion[edgeI] - << endl; - } + const edge& e = featureMesh.edges()[edgeI]; + label pointI = e.start(); + if (debug&meshRefinement::FEATURESEEDS) + { + Pout<< "Adding particle from point:" << pointI + << " coord:" << featureMesh.points()[pointI] + << " on circular region:" << edgeRegion[edgeI] + << endl; + } - // Non-manifold point. Create particle. - startPointCloud.addParticle - ( - new trackedParticle + // Non-manifold point. Create particle. + startPointCloud.addParticle ( - mesh_, - keepPoint, - cellI, - tetFaceI, - tetPtI, - featureMesh.points()[pointI], // endpos - featureLevel, // level - featI, // featureMesh - pointI // end point - ) - ); + new trackedParticle + ( + mesh_, + keepPoint, + cellI, + tetFaceI, + tetPtI, + featureMesh.points()[pointI], // endpos + featureLevel, // level + featI, // featureMesh + pointI // end point + ) + ); + } } } } @@ -628,7 +633,7 @@ void Foam::meshRefinement::markFeatureCellLevel // Calculates list of cells to refine based on intersection with feature edge. Foam::label Foam::meshRefinement::markFeatureRefinement ( - const point& keepPoint, + const pointField& keepPoints, const label nAllowRefine, labelList& refineCell, @@ -637,7 +642,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement { // Largest refinement level of any feature passed through labelList maxFeatureLevel; - markFeatureCellLevel(keepPoint, maxFeatureLevel); + markFeatureCellLevel(keepPoints, maxFeatureLevel); // See which cells to refine. maxFeatureLevel will hold highest level // of any feature edge that passed through. @@ -2009,7 +2014,7 @@ Foam::label Foam::meshRefinement::markProximityRefinement // hitting overall limit maxGlobalCells. Foam::labelList Foam::meshRefinement::refineCandidates ( - const point& keepPoint, + const pointField& keepPoints, const scalar curvature, const scalar planarAngle, @@ -2077,7 +2082,7 @@ Foam::labelList Foam::meshRefinement::refineCandidates { label nFeatures = markFeatureRefinement ( - keepPoint, + keepPoints, nAllowRefine, refineCell, diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options index 185fd4077e..f2367d2e1d 100644 --- a/src/sixDoFRigidBodyMotion/Make/options +++ b/src/sixDoFRigidBodyMotion/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -DFULLDEBUG -g -O0 \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C index a72502c9f5..9154e51216 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::axis::read } -void Foam::sixDoFRigidBodyMotionConstraints::axis::writeData +void Foam::sixDoFRigidBodyMotionConstraints::axis::write ( Ostream& os ) const @@ -125,5 +125,4 @@ void Foam::sixDoFRigidBodyMotionConstraints::axis::writeData << axis_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H index eef229af87..291c3421f8 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/axis/sixDoFRigidBodyMotionAxisConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,8 +101,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMCCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C index d4617d7509..ff056c2591 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::line::read } -void Foam::sixDoFRigidBodyMotionConstraints::line::writeData +void Foam::sixDoFRigidBodyMotionConstraints::line::write ( Ostream& os ) const @@ -125,5 +125,4 @@ void Foam::sixDoFRigidBodyMotionConstraints::line::writeData << dir_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H index 095bedbeb0..7d49190720 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/line/sixDoFRigidBodyMotionLineConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,8 +100,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMCCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C index f265692aaf..28bf1c4811 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,11 +96,11 @@ bool Foam::sixDoFRigidBodyMotionConstraints::orientation::read } -void Foam::sixDoFRigidBodyMotionConstraints::orientation::writeData +void Foam::sixDoFRigidBodyMotionConstraints::orientation::write ( Ostream& os ) const -{} - +{ +} // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H index 197a56aca9..5a41498e95 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/orientation/sixDoFRigidBodyMotionOrientationConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,8 +94,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMCCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C index 39adf2fb7f..286e279b77 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::plane::read } -void Foam::sixDoFRigidBodyMotionConstraints::plane::writeData +void Foam::sixDoFRigidBodyMotionConstraints::plane::write ( Ostream& os ) const @@ -106,5 +106,4 @@ void Foam::sixDoFRigidBodyMotionConstraints::plane::writeData << normal_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H index 24e8f220dc..1467e54e78 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/plane/sixDoFRigidBodyMotionPlaneConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,8 +100,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMCCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C index 79b6b92c4c..1068b01af4 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ bool Foam::sixDoFRigidBodyMotionConstraints::point::read } -void Foam::sixDoFRigidBodyMotionConstraints::point::writeData +void Foam::sixDoFRigidBodyMotionConstraints::point::write ( Ostream& os ) const @@ -106,5 +106,4 @@ void Foam::sixDoFRigidBodyMotionConstraints::point::writeData << point_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H index b13a3ebd51..39200c0c5c 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/point/sixDoFRigidBodyMotionPointConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,8 +103,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMCCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C index 1bd6f0a850..10044ac832 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,21 +60,14 @@ bool Foam::sixDoFRigidBodyMotionConstraint::read const dictionary& sDoFRBMCDict ) { - sDoFRBMCCoeffs_ = sDoFRBMCDict.subOrEmptyDict(type() + "Coeffs"); + sDoFRBMCCoeffs_ = sDoFRBMCDict; return true; } void Foam::sixDoFRigidBodyMotionConstraint::write(Ostream& os) const -{ - os << indent << word(type() + "Coeffs") << nl - << indent << token::BEGIN_BLOCK << nl << incrIndent; - - writeData(os); - - os << decrIndent << indent << token::END_BLOCK << endl; -} +{} // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H index b8d689e545..b4eed214f9 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -146,12 +146,8 @@ public: return sDoFRBMCCoeffs_; } - //- Write virtual void write(Ostream&) const; - - //- Write model data - virtual void writeData(Ostream&) const = 0; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C index 0f6b3d448d..b6f3e8fb1f 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,10 @@ Foam::sixDoFRigidBodyMotionConstraint::New const dictionary& sDoFRBMCDict ) { - const word constraintType(sDoFRBMCDict.lookup(typeName)); + const word constraintType + ( + sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint") + ); dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(constraintType); @@ -45,12 +48,11 @@ Foam::sixDoFRigidBodyMotionConstraint::New ( "sixDoFRigidBodyMotionConstraint::New" "(" - "const word&, " - "const dictionary&" + "const dictionary& sDoFRBMCDict" ")" - ) << "Unknown " << typeName << " type " + ) << "Unknown sixDoFRigidBodyMotionConstraint type " << constraintType << nl << nl - << "Valid " << typeName << "s are : " << endl + << "Valid sixDoFRigidBodyMotionConstraints are : " << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C index d54eb85a99..504944bb29 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -195,7 +195,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::read } -void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::writeData +void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::write ( Ostream& os ) const @@ -213,5 +213,4 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::writeData << damping_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H index 0fc9537d4a..4a30e30c65 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearAxialAngularSpring/linearAxialAngularSpring.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,8 +114,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C index f2ec442f96..792f265c2d 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,7 +100,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearDamper::read } -void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::writeData +void Foam::sixDoFRigidBodyMotionRestraints::linearDamper::write ( Ostream& os ) const diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.H index 83b2e720b7..0e991363fc 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearDamper/linearDamper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,8 +104,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C index 3ab352c684..a26660caf8 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -120,7 +120,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::linearSpring::read } -void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::writeData +void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::write ( Ostream& os ) const @@ -141,5 +141,4 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::writeData << restLength_ << token::END_STATEMENT << nl; } - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.H index 3b9fb7983e..dbd12372c3 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpring/linearSpring.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -117,8 +117,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C index cd0a5b39d5..6f53b50407 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,21 +60,10 @@ bool Foam::sixDoFRigidBodyMotionRestraint::read const dictionary& sDoFRBMRDict ) { - sDoFRBMRCoeffs_ = sDoFRBMRDict.subOrEmptyDict(type() + "Coeffs"); + sDoFRBMRCoeffs_ = sDoFRBMRDict; return true; } -void Foam::sixDoFRigidBodyMotionRestraint::write(Ostream& os) const -{ - os << indent << word(type() + "Coeffs") << nl - << indent << token::BEGIN_BLOCK << nl << incrIndent; - - writeData(os); - - os << decrIndent << indent << token::END_BLOCK << endl; -} - - // ************************************************************************* // diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H index 8fa20f2167..41216a0c2b 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,12 +150,8 @@ public: return sDoFRBMRCoeffs_; } - //- Write - virtual void write(Ostream&) const; - - //- Write model data - virtual void writeData(Ostream&) const = 0; + virtual void write(Ostream&) const = 0; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C index 8068ad8c7a..1bb047a77d 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,10 @@ Foam::sixDoFRigidBodyMotionRestraint::New const dictionary& sDoFRBMRDict ) { - const word restraintType(sDoFRBMRDict.lookup(typeName)); + const word restraintType + ( + sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint") + ); dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(restraintType); @@ -45,12 +48,11 @@ Foam::sixDoFRigidBodyMotionRestraint::New ( "sixDoFRigidBodyMotionRestraint::New" "(" - "const word&, " - "const dictionary&" + "const dictionary& sDoFRBMRDict" ")" - ) << "Unknown " << typeName << " type " + ) << "Unknown sixDoFRigidBodyMotionRestraint type " << restraintType << nl << nl - << "Valid " << typeName << " s types are : " << endl + << "Valid sixDoFRigidBodyMotionRestraint types are : " << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C index 28e7392822..fe5481689f 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::read } -void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::writeData +void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularDamper::write ( Ostream& os ) const diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.H index 6cd7c19244..d917ae7d91 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularDamper/sphericalAngularDamper.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,8 +103,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C index 05d3ba7ea1..a0525a19e6 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -147,7 +147,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::read } -void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::writeData +void Foam::sixDoFRigidBodyMotionRestraints::sphericalAngularSpring::write ( Ostream& os ) const diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.H index 4201780b87..f1bfa784d3 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sphericalAngularSpring/sphericalAngularSpring.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,8 +111,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C index 775bf8cb9d..1bf86e3b19 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -221,8 +221,7 @@ bool Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::read } -void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring:: -writeData +void Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::write ( Ostream& os ) const diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H index 43f8d75fac..bcd2c2c5b3 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,8 +121,8 @@ public: //- Update properties from given dictionary virtual bool read(const dictionary& sDoFRBMRCoeff); - //- Write model data - virtual void writeData(Ostream&) const; + //- Write + virtual void write(Ostream&) const; }; diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C index ccff806171..11670ba623 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,8 +60,14 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const os.writeKeyword("sixDoFRigidBodyMotionRestraint") << restraintType << token::END_STATEMENT << nl; + os.writeKeyword(word(restraintType + "Coeffs")) << nl; + + os << indent << token::BEGIN_BLOCK << nl << incrIndent; + restraints_[rI].write(os); + os << decrIndent << indent << token::END_BLOCK << nl; + os << decrIndent << indent << token::END_BLOCK << endl; } @@ -83,8 +89,16 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const os.writeKeyword("sixDoFRigidBodyMotionConstraint") << constraintType << token::END_STATEMENT << nl; + constraints_[rI].sixDoFRigidBodyMotionConstraint::write(os); + + os.writeKeyword(word(constraintType + "Coeffs")) << nl; + + os << indent << token::BEGIN_BLOCK << nl << incrIndent; + constraints_[rI].write(os); + os << decrIndent << indent << token::END_BLOCK << nl; + os << decrIndent << indent << token::END_BLOCK << endl; }