diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C index 86eabba39e..21f8dfda33 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C +++ b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C @@ -28,7 +28,6 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "laminar.H" #include "turbulentTransportModel.H" #include "LESModel.H" @@ -50,13 +49,32 @@ makeBaseTurbulenceModel immiscibleIncompressibleTwoPhaseMixture ); +#define makeLaminarModel(Type) \ + makeTemplatedTurbulenceModel \ + ( \ + immiscibleIncompressibleTwoPhaseMixturePhaseCompressibleTurbulenceModel,\ + laminar, \ + Type \ + ) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ - (immiscibleIncompressibleTwoPhaseMixturePhaseCompressibleTurbulenceModel, RAS, Type) + ( \ + immiscibleIncompressibleTwoPhaseMixturePhaseCompressibleTurbulenceModel,\ + RAS, \ + Type \ + ) #define makeLESModel(Type) \ makeTemplatedTurbulenceModel \ - (immiscibleIncompressibleTwoPhaseMixturePhaseCompressibleTurbulenceModel, LES, Type) + ( \ + immiscibleIncompressibleTwoPhaseMixturePhaseCompressibleTurbulenceModel,\ + LES, \ + Type \ + ) + +#include "Stokes.H" +makeLaminarModel(Stokes); #include "kEpsilon.H" makeRASModel(kEpsilon); @@ -70,4 +88,5 @@ makeLESModel(kEqn); #include "kOmega.H" makeRASModel(kOmega); + // ************************************************************************* // diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index f7e561f43d..5e009ea114 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -640,11 +640,14 @@ int main(int argc, char *argv[]) geometry, surfaces ); + // Patch fields + volScalarField::Boundary& cellDistanceBf = + cellDistance.boundaryFieldRef(); forAll(fvm.C().boundaryField(), patchi) { const pointField& cc = fvm.C().boundaryField()[patchi]; - fvPatchScalarField& fld = cellDistance.boundaryField()[patchi]; + fvPatchScalarField& fld = cellDistanceBf[patchi]; scalarField patchDistSqr ( fld.patch().patchInternalField(distSqr) diff --git a/src/TurbulenceModels/schemes/Make/options b/src/TurbulenceModels/schemes/Make/options index 29eef672df..26b3200f19 100644 --- a/src/TurbulenceModels/schemes/Make/options +++ b/src/TurbulenceModels/schemes/Make/options @@ -5,7 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lcompressibleTransportModels \ @@ -14,4 +15,5 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lcompressibleTurbulenceModels \ -lfluidThermophysicalModels \ - -lfiniteVolume + -lfiniteVolume \ + -lmeshTools diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index c15bbcf0cb..da70b0cc18 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -468,7 +468,7 @@ void kOmegaSSTBase::correct() + fvm::div(alphaRhoPhi, omega_) - fvm::laplacian(alpha*rho*DomegaEff(F1), omega_) == - alpha*rho*gamma*GbyNu(GbyNu0, F23(), S2()) + alpha()*rho()*gamma*GbyNu(GbyNu0, F23(), S2()) - fvm::SuSp((2.0/3.0)*alpha()*rho()*gamma*divU, omega_) - fvm::Sp(alpha()*rho()*beta*omega_(), omega_) - fvm::SuSp diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H index 7b303e728f..d249c7e3d3 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H @@ -28,7 +28,7 @@ Group grpWallFunctions Description - This boundary condition provides a wall constraint on turbulnce specific + This boundary condition provides a wall constraint on turbulence specific dissipation, omega for both low and high Reynolds number turbulence models. The near-wall omega may be either blended between the viscous region and diff --git a/src/combustionModels/laminar/laminar.H b/src/combustionModels/laminar/laminar.H index a4589d4ac1..605850bef7 100644 --- a/src/combustionModels/laminar/laminar.H +++ b/src/combustionModels/laminar/laminar.H @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef laminar_H -#define laminar_H +#ifndef combustionModels_laminar_H +#define combustionModels_laminar_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C index 92f9d60fef..89180f26db 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -57,7 +57,7 @@ void Foam::motionSmootherAlgo::checkConstraints } - typename FldType::Boundary& bFld = pf.boundaryField(); + typename FldType::Boundary& bFld = pf.boundaryFieldRef(); // Evaluate in reverse order diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H index ceaecabb25..5ff3b87765 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H @@ -32,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef laminar_H -#define laminar_H +#ifndef regionModels_surfaceFilmModels_laminar_H +#define regionModels_surfaceFilmModels_laminar_H #include "filmTurbulenceModel.H" diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C index f6476e46a0..dbe3eee194 100644 --- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C +++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -80,7 +80,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver mesh.time().timeName(), "uniform", mesh - ).headerOk() + ).typeHeaderOk(false) ? IOdictionary ( IOobject