From 6af8b9db7b1ab15e4105aa7edb4a98e61148fa79 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 17 Mar 2011 17:49:15 +0000
Subject: [PATCH] porousSimpleFoam: updated and now a sub-application to
 simpleFoam

---
 .../porousSimpleFoam/createFields.H           | 70 -------------------
 .../solvers/incompressible/simpleFoam/pEqn.H  |  2 +-
 .../porousSimpleFoam/Make/files               |  0
 .../porousSimpleFoam/Make/options             |  2 +-
 .../{ => simpleFoam}/porousSimpleFoam/UEqn.H  |  0
 .../{ => simpleFoam}/porousSimpleFoam/pEqn.H  |  0
 .../porousSimpleFoam/porousSimpleFoam.C       |  1 +
 7 files changed, 3 insertions(+), 72 deletions(-)
 delete mode 100644 applications/solvers/incompressible/porousSimpleFoam/createFields.H
 rename applications/solvers/incompressible/{ => simpleFoam}/porousSimpleFoam/Make/files (100%)
 rename applications/solvers/incompressible/{ => simpleFoam}/porousSimpleFoam/Make/options (95%)
 rename applications/solvers/incompressible/{ => simpleFoam}/porousSimpleFoam/UEqn.H (100%)
 rename applications/solvers/incompressible/{ => simpleFoam}/porousSimpleFoam/pEqn.H (100%)
 rename applications/solvers/incompressible/{ => simpleFoam}/porousSimpleFoam/porousSimpleFoam.C (98%)

diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H
deleted file mode 100644
index 2de8fbf7377..00000000000
--- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H
+++ /dev/null
@@ -1,70 +0,0 @@
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "createPhi.H"
-
-
-    label pRefCell = 0;
-    scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
-
-    singlePhaseTransportModel laminarTransport(U, phi);
-
-    autoPtr<incompressible::RASModel> turbulence
-    (
-        incompressible::RASModel::New(U, phi, laminarTransport)
-    );
-
-
-    porousZones pZones(mesh);
-    Switch pressureImplicitPorosity(false);
-
-    // nUCorrectors used for pressureImplicitPorosity
-    int nUCorr = 0;
-    if (pZones.size())
-    {
-        // nUCorrectors for pressureImplicitPorosity
-        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
-        {
-            nUCorr = readInt
-            (
-                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
-            );
-        }
-
-        if (nUCorr > 0)
-        {
-            pressureImplicitPorosity = true;
-            Info<< "Using pressure implicit porosity" << endl;
-        }
-        else
-        {
-            Info<< "Using pressure explicit porosity" << endl;
-        }
-    }
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index c5b9748c5d8..0b1500213a7 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -24,7 +24,7 @@
         }
     }
 
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 
     // Explicitly relax pressure for momentum corrector
     p.relax();
diff --git a/applications/solvers/incompressible/porousSimpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/files
similarity index 100%
rename from applications/solvers/incompressible/porousSimpleFoam/Make/files
rename to applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/files
diff --git a/applications/solvers/incompressible/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
similarity index 95%
rename from applications/solvers/incompressible/porousSimpleFoam/Make/options
rename to applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
index c658bfe518c..f1887d9aff0 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/Make/options
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../simpleFoam \
+    -I.. \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
     -I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
similarity index 100%
rename from applications/solvers/incompressible/porousSimpleFoam/UEqn.H
rename to applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
diff --git a/applications/solvers/incompressible/porousSimpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
similarity index 100%
rename from applications/solvers/incompressible/porousSimpleFoam/pEqn.H
rename to applications/solvers/incompressible/simpleFoam/porousSimpleFoam/pEqn.H
diff --git a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
similarity index 98%
rename from applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
rename to applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index 89caf476f0d..6140eb17186 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createPorousZones.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-- 
GitLab