diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H index 6acb19994a..a085aebb37 100644 --- a/applications/solvers/multiphase/settlingFoam/createFields.H +++ b/applications/solvers/multiphase/settlingFoam/createFields.H @@ -56,20 +56,11 @@ ); - dimensionedScalar rhoc - ( - transportProperties.lookup("rhoc") - ); + dimensionedScalar rhoc(transportProperties.lookup("rhoc")); - dimensionedScalar rhod - ( - transportProperties.lookup("rhod") - ); + dimensionedScalar rhod(transportProperties.lookup("rhod")); - dimensionedScalar muc - ( - transportProperties.lookup("muc") - ); + dimensionedScalar muc(transportProperties.lookup("muc")); dimensionedScalar plasticViscosityCoeff ( @@ -96,10 +87,7 @@ transportProperties.lookup("yieldStressOffset") ); - Switch BinghamPlastic - ( - transportProperties.lookup("BinghamPlastic") - ); + Switch BinghamPlastic(transportProperties.lookup("BinghamPlastic")); volScalarField rho ( @@ -147,8 +135,8 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - muc + - plasticViscosity + muc + + plasticViscosity ( plasticViscosityCoeff, plasticViscosityExponent, @@ -176,10 +164,7 @@ Info<< "Selecting Drift-Flux model " << endl; - word VdjModel - ( - transportProperties.lookup("VdjModel") - ); + word VdjModel(transportProperties.lookup("VdjModel")); Info<< tab << VdjModel << " selected\n" << endl; @@ -188,26 +173,13 @@ transportProperties.subDict(VdjModel + "Coeffs") ); - dimensionedVector V0 - ( - VdjModelCoeffs.lookup("V0") - ); + dimensionedVector V0(VdjModelCoeffs.lookup("V0")); - dimensionedScalar a - ( - VdjModelCoeffs.lookup("a") - ); + dimensionedScalar a(VdjModelCoeffs.lookup("a")); - dimensionedScalar a1 - ( - VdjModelCoeffs.lookup("a1") - ); - - dimensionedScalar alphaMin - ( - VdjModelCoeffs.lookup("alphaMin") - ); + dimensionedScalar a1(VdjModelCoeffs.lookup("a1")); + dimensionedScalar alphaMin(VdjModelCoeffs.lookup("alphaMin")); IOdictionary RASProperties @@ -223,15 +195,9 @@ ); - Switch turbulence - ( - RASProperties.lookup("turbulence") - ); + Switch turbulence(RASProperties.lookup("turbulence")); - dictionary kEpsilonDict - ( - RASProperties.subDictPtr("kEpsilonCoeffs") - ); + dictionary kEpsilonDict(RASProperties.subDictPtr("kEpsilonCoeffs")); dimensionedScalar Cmu ( @@ -273,30 +239,27 @@ ) ); - dimensionedScalar alphak + dimensionedScalar sigmak ( dimensionedScalar::lookupOrAddToDict ( - "alphaEps", + "sigmak", kEpsilonDict, 1.0 ) ); - dimensionedScalar alphaEps + dimensionedScalar sigmaEps ( dimensionedScalar::lookupOrAddToDict ( - "alphaEps", + "sigmaEps", kEpsilonDict, - 0.76923 + 1.3 ) ); - dictionary wallFunctionDict - ( - RASProperties.subDictPtr("wallFunctionCoeffs") - ); + dictionary wallFunctionDict(RASProperties.subDictPtr("wallFunctionCoeffs")); dimensionedScalar kappa ( diff --git a/applications/solvers/multiphase/settlingFoam/kEpsilon.H b/applications/solvers/multiphase/settlingFoam/kEpsilon.H index 742fcde708..522a9afac7 100644 --- a/applications/solvers/multiphase/settlingFoam/kEpsilon.H +++ b/applications/solvers/multiphase/settlingFoam/kEpsilon.H @@ -1,4 +1,4 @@ -if(turbulence) +if (turbulence) { if (mesh.changing()) { @@ -15,9 +15,9 @@ if(turbulence) tgradU.clear(); volScalarField Gcoef = - alphak*Cmu*k*(g & fvc::grad(rho))/(epsilon + epsilon0); + Cmu*k/sigmak*(g & fvc::grad(rho))/(epsilon + epsilon0); -# include "wallFunctions.H" + #include "wallFunctions.H" // Dissipation equation fvScalarMatrix epsEqn @@ -26,7 +26,7 @@ if(turbulence) + fvm::div(phi, epsilon) - fvm::laplacian ( - alphaEps*mut + mul, epsilon, + mut/sigmaEps + mul, epsilon, "laplacian(DepsilonEff,epsilon)" ) == @@ -35,7 +35,7 @@ if(turbulence) - fvm::Sp(C2*rho*epsilon/k, epsilon) ); -# include "wallDissipation.H" + #include "wallDissipation.H" epsEqn.relax(); epsEqn.solve(); @@ -51,7 +51,7 @@ if(turbulence) + fvm::div(phi, k) - fvm::laplacian ( - alphak*mut + mul, k, + mut/sigmak + mul, k, "laplacian(DkEff,k)" ) == @@ -66,7 +66,7 @@ if(turbulence) //- Re-calculate viscosity mut = rho*Cmu*sqr(k)/(epsilon + epsilon0); -# include "wallViscosity.H" + #include "wallViscosity.H" } mu = mut + mul;