Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus

src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,8 +26,8 @@ Class
 
 Description
     IDDESDelta used by the IDDES (improved low Re Spalart-Allmaras DES model)
-    The min and max delta are calculated using the double distance of the min or
-    max from the face centre to the cell centre.
+    The min and max delta are calculated using the face to face distance of
+    the cell.
 
 SourceFiles
     IDDESDelta.C

src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C

@@ -269,8 +269,6 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
 
     motion_.write(os);
 
-    //motion_.solver().write(os);
-
     initialPoints_.writeEntry("initialPoints", os);
 
     writeEntry("value", os);

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H

@@ -52,6 +52,7 @@ SourceFiles
 #include "sixDoFRigidBodyMotionConstraint.H"
 #include "Tuple2.H"
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C

@@ -25,6 +25,7 @@ License
 
 #include "sixDoFRigidBodyMotion.H"
 #include "IOstreams.H"
+#include "sixDoFSolver.H"
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
@@ -112,6 +113,12 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const
 
         os  << decrIndent << indent << token::END_BLOCK << nl;
     }
+
+    if (!solver_.empty())
+    {
+        os  << indent << "solver";
+        solver_->write(os);
+    }
 }