diff --git a/src/Allwmake b/src/Allwmake index 354aee075d608b0aeee05a94631b7e2b8969c897..2fd099352dc9e53155bf3675491dd1e944b621a4 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -21,16 +21,16 @@ OSspecific/$WM_OSTYPE/Allwmake wmake libso OpenFOAM wmake libso fileFormats +wmake libso triSurface +wmake libso meshTools wmake libso edgeMesh wmake libso surfMesh -wmake libso triSurface # Decomposition methods needed by dummyThirdParty parallel/decompose/AllwmakeLnInclude # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools dummyThirdParty/Allwmake -wmake libso meshTools wmake libso lagrangian/basic wmake libso finiteVolume wmake libso genericPatchFields diff --git a/src/edgeMesh/Make/options b/src/edgeMesh/Make/options index 4796c18e22cf9681490e7dec2d345d7b86ee1b47..3c1b5258d3451f8b610bd8ddaa25f56e3efae601 100644 --- a/src/edgeMesh/Make/options +++ b/src/edgeMesh/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -ltriSurface \ - -lmeshTools \ + -lmeshTools \ -lfileFormats diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C index 25aaf37ef40c52e4b6c09901df51130a7e239b84..7eb2619cd846fd81743192e639b5842498b22c42 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -328,7 +328,7 @@ kOmegaSSTSAS::kOmegaSSTSAS bound(k_, kMin_); bound(omega_, omegaMin_); - updateSubGridScaleFields(magSqr(symm(fvc::grad(U)))); + updateSubGridScaleFields(magSqr(2.0*symm(fvc::grad(U)))); printCoeffs(); } @@ -345,7 +345,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU) y_.correct(); } - volScalarField S2 = magSqr(symm(gradU())); + volScalarField S2 = magSqr(2.0*symm(gradU())); gradU.clear(); volVectorField gradK = fvc::grad(k_); @@ -353,7 +353,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU) volScalarField L = sqrt(k_)/(pow025(Cmu_)*omega_); volScalarField CDkOmega = (2.0*alphaOmega2_)*(gradK & gradOmega)/omega_; volScalarField F1 = this->F1(CDkOmega); - volScalarField G = nuSgs_*2.0*S2; + volScalarField G = nuSgs_*0.5*S2; // Turbulent kinetic energy equation { @@ -388,7 +388,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU) - fvm::Sp(fvc::div(phi()), omega_) - fvm::laplacian(DomegaEff(F1), omega_) == - gamma(F1)*2.0*S2 + gamma(F1)*0.5*S2 - fvm::Sp(beta(F1)*omega_, omega_) - fvm::SuSp // cross diffusion term ( diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H index 8a27d515a22276d55a593a1e4f4d605b343b5344..444392668b6a86f66fcb24dc8039ac4b185d3452 100644 --- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H +++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H @@ -27,7 +27,11 @@ Class Description kOmegaSSTSAS LES turbulence model for incompressible flows - Reference: + References: + A Scale-Adaptive Simulation Model using Two-Equation Models + AIAA 2005-1095 + F. R. Menter and Y. Egorov + DESider A European Effort on Hybrid RANS-LES Modelling: Results of the European-Union Funded Project, 2004 - 2007 (Notes on Numerical Fluid Mechanics and Multidisciplinary Design).