Merge branch 'master' of /home/hunt2/OpenFOAM/OpenFOAM-dev

applications/solvers/Lagrangian/kinematicParcelFoam/Make/files

@@ -0,0 +1,3 @@
+kinematicParcelFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/kinematicParcelFoam

applications/solvers/Lagrangian/kinematicParcelFoam/Make/options

@@ -0,0 +1,21 @@
+EXE_INC = \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/RAS
+
+EXE_LIBS = \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lthermophysicalFunctions \
+    -lbasicThermophysicalModels \
+    /* -lcombustionThermophysicalModels */ \
+    -lspecie \
+    -lradiation \
+    -lcompressibleRASModels

applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H

@@ -0,0 +1,68 @@
+    Info<< "Reading thermophysical properties\n" << endl;
+
+    autoPtr<basicThermo> thermo
+    (
+        basicThermo::New(mesh)
+    );
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        thermo->rho()
+    );
+
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+#   include "compressibleCreatePhi.H"
+
+    Info<< "Creating turbulence model\n" << endl;
+    autoPtr<compressible::RASModel> turbulence
+    (
+        compressible::RASModel::New
+        (
+            rho,
+            U,
+            phi,
+            thermo()
+        )
+    );
+
+    pointMesh pMesh(mesh);
+    volPointInterpolation vpi(mesh, pMesh);
+
+    word kinematicCloudName("kinematicCloud");
+
+    if (args.options().found("cloudName"))
+    {
+        kinematicCloudName = args.options()["cloudName"];
+    }
+
+    Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
+    basicKinematicCloud kinematicCloud
+    (
+        kinematicCloudName,
+        vpi,
+        rho,
+        U,
+        thermo().mu(),
+        g
+    );

applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C

@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    kinematicParcelFoam
+
+Description
+    Transient solver a single kinematicCloud.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "basicThermo.H"
+#include "compressible/RASModel/RASModel.H"
+#include "basicKinematicCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::validOptions.insert("cloudName", "cloud name");
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readEnvironmentalProperties.H"
+    #include "createFields.H"
+    #include "compressibleCourantNo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        Info<< "Evolving " << kinematicCloud.name() << endl;
+        kinematicCloud.evolve();
+        kinematicCloud.info();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return(0);
+}
+
+
+// ************************************************************************* //

applications/solvers/compressible/rhoSimpleFoam/hEqn.H

@@ -5,7 +5,7 @@
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p, "div(U,p)"))
+        fvc::div(phi/fvc::interpolate(rho), p, "div(U,p)")
       - p*fvc::div(phi/fvc::interpolate(rho))
     );
 

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -1,40 +1,92 @@
-volScalarField AU = UEqn().A();
-U = UEqn().H()/AU;
-UEqn.clear();
-phi = fvc::interpolate(rho*U) & mesh.Sf();
-bool closedVolume = adjustPhi(phi, U, p);
+rho = thermo->rho();
 
-for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+volScalarField rUA = 1.0/UEqn().A();
+U = rUA*UEqn().H();
+UEqn.clear();
+
+bool closedVolume = false;
+
+if (transonic)
 {
-    fvScalarMatrix pEqn
+    surfaceScalarField phid
     (
-        fvm::laplacian(rho/AU, p) == fvc::div(phi)
+        "phid",
+        fvc::interpolate(thermo->psi())*(fvc::interpolate(U) & mesh.Sf())
     );
 
-    pEqn.setReference(pRefCell, pRefValue);
-    // retain the residual from the first iteration
-    if (nonOrth == 0)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
-        eqnResidual = pEqn.solve().initialResidual();
-        maxResidual = max(eqnResidual, maxResidual);
-    }
-    else
-    {
-        pEqn.solve();
-    }
+        fvScalarMatrix pEqn
+        (
+            fvm::div(phid, p)
+          - fvm::laplacian(rho*rUA, p)
+        );
 
-    if (nonOrth == nNonOrthCorr)
-    {
-        phi -= pEqn.flux();
+        // Relax the pressure equation to ensure diagonal-dominance
+        pEqn.relax(mesh.relaxationFactor("pEqn"));
+
+        pEqn.setReference(pRefCell, pRefValue);
+
+        // retain the residual from the first iteration
+        if (nonOrth == 0)
+        {
+            eqnResidual = pEqn.solve().initialResidual();
+            maxResidual = max(eqnResidual, maxResidual);
+        }
+        else
+        {
+            pEqn.solve();
+        }
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi == pEqn.flux();
+        }
     }
 }
+else
+{
+    phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
+    closedVolume = adjustPhi(phi, U, p);
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::laplacian(rho*rUA, p) == fvc::div(phi)
+        );
+
+        pEqn.setReference(pRefCell, pRefValue);
+
+        // Retain the residual from the first iteration
+        if (nonOrth == 0)
+        {
+            eqnResidual = pEqn.solve().initialResidual();
+            maxResidual = max(eqnResidual, maxResidual);
+        }
+        else
+        {
+            pEqn.solve();
+        }
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi -= pEqn.flux();
+        }
+    }
+}
+
 
 #include "incompressible/continuityErrs.H"
 
 // Explicitly relax pressure for momentum corrector
 p.relax();
 
-U -= fvc::grad(p)/AU;
+rho = thermo->rho();
+rho.relax();
+Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+
+U -= rUA*fvc::grad(p);
 U.correctBoundaryConditions();
 
 bound(p, pMin);
@@ -46,7 +98,3 @@ if (closedVolume)
     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
         /fvc::domainIntegrate(thermo->psi());
 }
-
-rho = thermo->rho();
-rho.relax();
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;