Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C

@@ -127,7 +127,6 @@ Foam::interRegionHeatTransferModel::~interRegionHeatTransferModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 void Foam::interRegionHeatTransferModel::addSup
 (
     fvMatrix<scalar>& eEqn,

src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H

@@ -453,7 +453,7 @@ public:
                 void interpolateToSource
                 (
                     const UList<Type>& fld,
-                    const CombineOp& bop,
+                    const CombineOp& cop,
                     List<Type>& result
                 ) const;
 
@@ -463,7 +463,7 @@ public:
                 void interpolateToTarget
                 (
                     const UList<Type>& fld,
-                    const CombineOp& bop,
+                    const CombineOp& cop,
                     List<Type>& result
                 ) const;
 

src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H

@@ -321,11 +321,11 @@ public:
                 ) const;
 
                 //- Low-level interpolate List
-                template<class Type, class BinaryOp>
+                template<class Type, class CombineOp>
                 void interpolate
                 (
                     const UList<Type>& fld,
-                    const BinaryOp& bop,
+                    const CombineOp& cop,
                     List<Type>& result
                 ) const;
 

src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,21 +59,21 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
 }
 
 
-template<class Type, class BinaryOp>
+template<class Type, class CombineOp>
 void Foam::cyclicAMIPolyPatch::interpolate
 (
     const UList<Type>& fld,
-    const BinaryOp& bop,
+    const CombineOp& cop,
     List<Type>& result
 ) const
 {
     if (owner())
     {
-        AMI().interpolateToSource(fld, bop, result);
+        AMI().interpolateToSource(fld, cop, result);
     }
     else
     {
-        neighbPatch().AMI().interpolateToTarget(fld, bop, result);
+        neighbPatch().AMI().interpolateToTarget(fld, cop, result);
     }
 }
 

src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C

@@ -266,4 +266,12 @@ bool Foam::codedFunctionObject::read(const dictionary& dict)
 }
 
 
+void Foam::codedFunctionObject::updateMesh(const mapPolyMesh&)
+{}
+
+
+void Foam::codedFunctionObject::movePoints(const polyMesh&)
+{}
+
+
 // ************************************************************************* //

src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,8 +82,10 @@ void vanDriestDelta::calcDelta()
         }
     }
 
+    scalar cutOff = wallPointYPlus::yPlusCutOff;
     wallPointYPlus::yPlusCutOff = 500;
     wallDistData<wallPointYPlus> y(mesh_, ystar);
+    wallPointYPlus::yPlusCutOff = cutOff;
 
     delta_ = min
     (

src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,8 +81,10 @@ void vanDriestDelta::calcDelta()
         }
     }
 
+    scalar cutOff = wallPointYPlus::yPlusCutOff;
     wallPointYPlus::yPlusCutOff = 500;
     wallDistData<wallPointYPlus> y(mesh_, ystar);
+    wallPointYPlus::yPlusCutOff = cutOff;
 
     delta_ = min
     (