removed over specification of rho and nu

applications/solvers/multiphase/lesCavitatingFoam/UEqn.H

@@ -1,8 +1,7 @@
-    surfaceScalarField gammaf = fvc::interpolate(gamma);
+    surfaceScalarField muf =
-    surfaceScalarField muf
     (
-            "muf",
+        "muEff",
-            gammaf*muv + (1.0 - gammaf)*mul
+        twoPhaseProperties.muf()
       + fvc::interpolate(rho*turbulence->nuSgs())
     );
 
@@ -10,9 +9,9 @@
     (
         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)

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"

applications/solvers/multiphase/lesCavitatingFoam/readTransportProperties.H

@@ -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")
-    );

applications/solvers/multiphase/rasCavitatingFoam/UEqn.H

@@ -1,18 +1,17 @@
-    surfaceScalarField gammaf = fvc::interpolate(gamma);
+    surfaceScalarField muEff
-    surfaceScalarField muf
     (
-            "muf",
+        "muEff",
-            gammaf*muv + (1.0 - gammaf)*mul
+        twoPhaseProperties.muf()
-          + fvc::interpolate(rho*turbulence->nuEff())
+      + 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)

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"

applications/solvers/multiphase/rasCavitatingFoam/readTransportProperties.H

@@ -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")
-    );