diff --git a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H index 22e4a4705619612238c7ba0424d0e11d9ce9fbfa..1ffad7a6a0dc8d19c0efbfa2788d4b1e01513059 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H +++ b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H @@ -1,18 +1,17 @@ - surfaceScalarField gammaf = fvc::interpolate(gamma); - surfaceScalarField muf - ( - "muf", - gammaf*muv + (1.0 - gammaf)*mul - + fvc::interpolate(rho*turbulence->nuSgs()) - ); + surfaceScalarField muf = + ( + "muEff", + twoPhaseProperties.muf() + + fvc::interpolate(rho*turbulence->nuSgs()) + ); fvVectorMatrix UEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) - - fvm::laplacian(muf, U) + - fvm::laplacian(muEff, U) //- (fvc::grad(U) & fvc::grad(muf)) - - fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf())) + - fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf())) ); if (momentumPredictor) diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C index c1dba14b9fd4aab4194bccd09e22367c70ec9ff2..a8f99ce905b62d133fc9b9b46b082e1ef690973b 100644 --- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C +++ b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C @@ -44,7 +44,6 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" # include "readThermodynamicProperties.H" -# include "readTransportProperties.H" # include "readControls.H" # include "createFields.H" # include "createAverages.H" diff --git a/applications/solvers/multiphase/lesCavitatingFoam/readTransportProperties.H b/applications/solvers/multiphase/lesCavitatingFoam/readTransportProperties.H deleted file mode 100644 index e413743b78b2eb830674d186555621e8b8a7cb42..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/lesCavitatingFoam/readTransportProperties.H +++ /dev/null @@ -1,23 +0,0 @@ - Info<< "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar mul - ( - transportProperties.lookup("mul") - ); - - dimensionedScalar muv - ( - transportProperties.lookup("muv") - ); diff --git a/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H b/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H index 2a54e1fba24fddb8820a4546609e0619f133470d..374e410c2e03793b8f2eaab26df890df4e333764 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H +++ b/applications/solvers/multiphase/rasCavitatingFoam/UEqn.H @@ -1,18 +1,17 @@ - surfaceScalarField gammaf = fvc::interpolate(gamma); - surfaceScalarField muf - ( - "muf", - gammaf*muv + (1.0 - gammaf)*mul - + fvc::interpolate(rho*turbulence->nuEff()) - ); + surfaceScalarField muEff + ( + "muEff", + twoPhaseProperties.muf() + + fvc::interpolate(rho*turbulence->nut()) + ); fvVectorMatrix UEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) - - fvm::laplacian(muf, U) + - fvm::laplacian(muEff, U) //- (fvc::grad(U) & fvc::grad(muf)) - - fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf())) + - fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf())) ); if (momentumPredictor) diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C index b2ebdb46af679cb14df7f75629327d69d7d3b916..9ed182be3705b187bd827b771f1fa98ab03d97b2 100644 --- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C +++ b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C @@ -44,7 +44,6 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" # include "readThermodynamicProperties.H" -# include "readTransportProperties.H" # include "readControls.H" # include "createFields.H" # include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/rasCavitatingFoam/readTransportProperties.H b/applications/solvers/multiphase/rasCavitatingFoam/readTransportProperties.H deleted file mode 100644 index e413743b78b2eb830674d186555621e8b8a7cb42..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/rasCavitatingFoam/readTransportProperties.H +++ /dev/null @@ -1,23 +0,0 @@ - Info<< "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar mul - ( - transportProperties.lookup("mul") - ); - - dimensionedScalar muv - ( - transportProperties.lookup("muv") - );