From 8490014bf6b0e4d06ea93d2133101cbba02163e7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 12 Nov 2010 12:13:28 +0000
Subject: [PATCH] rhoSimplecFoam: further developments

not entirely satisfactory
---
 .../compressible/rhoSimplecFoam/UEqn.H        | 11 --------
 .../compressible/rhoSimplecFoam/hEqn.H        | 28 -------------------
 .../compressible/rhoSimplecFoam/pEqn.H        | 10 +++++--
 .../rhoSimplecFoam/rhoSimplecFoam.C           |  1 +
 4 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 applications/solvers/compressible/rhoSimplecFoam/UEqn.H
 delete mode 100644 applications/solvers/compressible/rhoSimplecFoam/hEqn.H

diff --git a/applications/solvers/compressible/rhoSimplecFoam/UEqn.H b/applications/solvers/compressible/rhoSimplecFoam/UEqn.H
deleted file mode 100644
index 21ec2646be..0000000000
--- a/applications/solvers/compressible/rhoSimplecFoam/UEqn.H
+++ /dev/null
@@ -1,11 +0,0 @@
-    // Solve the Momentum equation
-
-    tmp<fvVectorMatrix> UEqn
-    (
-        fvm::div(phi, U)
-      + turbulence->divDevRhoReff(U)
-    );
-
-    UEqn().relax();
-
-    solve(UEqn() == -fvc::grad(p));
diff --git a/applications/solvers/compressible/rhoSimplecFoam/hEqn.H b/applications/solvers/compressible/rhoSimplecFoam/hEqn.H
deleted file mode 100644
index bec9ed3ae0..0000000000
--- a/applications/solvers/compressible/rhoSimplecFoam/hEqn.H
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    fvScalarMatrix hEqn
-    (
-        fvm::div(phi, h)
-      - fvm::Sp(fvc::div(phi), h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-        fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p, "div(U,p)"))
-      - p*fvc::div(phi/fvc::interpolate(rho))
-    );
-
-    hEqn.relax();
-
-    hEqn.solve();
-
-    thermo.correct();
-
-    rho = thermo.rho();
-
-    if (!transonic)
-    {
-        rho.relax();
-    }
-
-    Info<< "rho max/min : "
-        << max(rho).value() << " "
-        << min(rho).value() << endl;
-}
diff --git a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H b/applications/solvers/compressible/rhoSimplecFoam/pEqn.H
index 43443a507b..2e370cc447 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimplecFoam/pEqn.H
@@ -1,3 +1,8 @@
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+
 volScalarField p0 = p;
 
 volScalarField AU = UEqn().A();
@@ -24,8 +29,8 @@ if (transonic)
           + phid*(fvc::interpolate(p) - fvc::interpolate(p, "UD"))
         );
 
-        refCast<mixedFvPatchScalarField>(p.boundaryField()[1]).refValue()
-            = p.boundaryField()[1];
+        //refCast<mixedFvPatchScalarField>(p.boundaryField()[1]).refValue()
+        //    = p.boundaryField()[1];
 
         fvScalarMatrix pEqn
         (
@@ -35,6 +40,7 @@ if (transonic)
           + fvc::div(phid)*p
           - fvm::laplacian(rho/AtU, p)
         );
+        //pEqn.relax();
 
         pEqn.setReference(pRefCell, pRefValue);
 
diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
index 541e7b388f..c959cfdd3e 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
@@ -57,6 +57,7 @@ int main(int argc, char *argv[])
         #include "readSIMPLEControls.H"
 
         p.storePrevIter();
+        rho.storePrevIter();
 
         if (!transonic)
         {