Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

src/Allwmake

@@ -1,5 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+
+if [ "$PWD" != "$WM_PROJECT_DIR/src" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR/src"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 set -x
 
 # update OpenFOAM version strings if required

src/turbulenceModels/compressible/LES/LESModel/LESModel.C

@@ -84,6 +84,10 @@ LESModel::LESModel
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
     readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
 }
 
 

src/turbulenceModels/compressible/RAS/RASModel/RASModel.C

@@ -88,7 +88,11 @@ RASModel::RASModel
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
 
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //

src/turbulenceModels/incompressible/LES/LESModel/LESModel.C

@@ -82,6 +82,10 @@ LESModel::LESModel
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
     readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
 }
 
 

src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C

@@ -133,8 +133,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
 
     const scalarField& nuw =
         patch().lookupPatchField<volScalarField, scalar>(nuName_);
-    scalarField& nuSgsw = *this;
 
+    scalarField& nuSgsw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
 
@@ -178,6 +178,8 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
             nuSgsw[facei] = 0;
         }
     }
+
+    fixedValueFvPatchScalarField::evaluate();
 }
 
 

src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C

@@ -87,7 +87,11 @@ RASModel::RASModel
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
 
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //