From 17132c95605421f27ae2247ddd2829a7c7539c11 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 13 May 2008 11:05:39 +0100
Subject: [PATCH] removed over specification of rho and nu

---
 .../multiphase/lesCavitatingFoam/UEqn.H       | 17 +++++++-------
 .../lesCavitatingFoam/lesCavitatingFoam.C     |  1 -
 .../readTransportProperties.H                 | 23 -------------------
 .../multiphase/rasCavitatingFoam/UEqn.H       | 17 +++++++-------
 .../rasCavitatingFoam/rasCavitatingFoam.C     |  1 -
 .../readTransportProperties.H                 | 23 -------------------
 6 files changed, 16 insertions(+), 66 deletions(-)
 delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/readTransportProperties.H
 delete mode 100644 applications/solvers/multiphase/rasCavitatingFoam/readTransportProperties.H

diff --git a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
index 22e4a470561..1ffad7a6a0d 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 c1dba14b9fd..a8f99ce905b 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 e413743b78b..00000000000
--- 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 2a54e1fba24..374e410c2e0 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 b2ebdb46af6..9ed182be370 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 e413743b78b..00000000000
--- 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")
-    );
-- 
GitLab