Thermodynamics: Initialized dpdt to 0 and added a switch on update

so that the effect of the term on the enthalpy equation is optional
2012-09-13 11:25:55 +01:00 · 2012-09-13 11:25:55 +01:00 · 8609c83645
commit 8609c83645
parent 5e9303103a
39 changed files with 247 additions and 2059 deletions
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@ -60,7 +60,17 @@


    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@ -70,4 +70,7 @@ U = HbyA - (invA & (betav*fvc::grad(p)));
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@ -61,7 +61,17 @@
    );

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@ -70,4 +70,7 @@ U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/applications/solvers/combustion/coldEngineFoam/createFields.H
@ -55,7 +55,17 @@
    );

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@ -64,4 +64,7 @@ U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@ -85,7 +85,17 @@


    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/fireFoam/pEqn.H
+++ b/applications/solvers/combustion/fireFoam/pEqn.H
@ -52,4 +52,7 @@ p = p_rgh + rho*gh;

 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@ -62,7 +62,17 @@ reaction->setTurbulence(turbulence());


 Info<< "Creating field dpdt\n" << endl;
-volScalarField dpdt("dpdt", fvc::ddt(p));
+volScalarField dpdt
+(
+    IOobject
+    (
+        "dpdt",
+        runTime.timeName(),
+        mesh
+    ),
+    mesh,
+    dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+);

 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/reactingFoam/pEqn.H
+++ b/applications/solvers/combustion/reactingFoam/pEqn.H
@ -70,4 +70,7 @@ U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/combustion/rhoReactingFoam/createFields.H
+++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H
@ -64,7 +64,17 @@ reaction->setTurbulence(turbulence());


 Info<< "Creating field dpdt\n" << endl;
-volScalarField dpdt("dpdt", fvc::ddt(p));
+volScalarField dpdt
+(
+    IOobject
+    (
+        "dpdt",
+        runTime.timeName(),
+        mesh
+    ),
+    mesh,
+    dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+);

 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H
+++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
@ -89,5 +89,8 @@
    U.correctBoundaryConditions();
    K = 0.5*magSqr(U);

-    dpdt = fvc::ddt(p);
+    if (thermo.dpdt())
+    {
+        dpdt = fvc::ddt(p);
+    }
 }
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@ -55,7 +55,17 @@
    );

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@ -94,4 +94,7 @@ U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H
@ -102,7 +102,10 @@ U = HbyA - rAtU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}

 // Recalculate density from the relaxed pressure
 rho = thermo.rho();
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
@ -96,4 +96,7 @@ U = HbyA - rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
@ -75,7 +75,17 @@
    p_rgh = p - rho*gh;

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
@ -61,7 +61,10 @@
    // Second part of thermodynamic density update
    thermo.rho() += psi*p_rgh;

-    dpdt = fvc::ddt(p);
+    if (thermo.dpdt())
+    {
+        dpdt = fvc::ddt(p);
+    }

    #include "rhoEqn.H"
    #include "compressibleContinuityErrs.H"
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@ -175,8 +175,19 @@
            i,
            new volScalarField
            (
-                "dpdt",
-                fvc::ddt(thermoFluid[i].p())
+                IOobject
+                (
+                    "dpdt",
+                    runTime.timeName(),
+                    fluidRegions[i]
+                ),
+                fluidRegions[i],
+                dimensionedScalar
+                (
+                    "dpdt",
+                    thermoFluid[i].p().dimensions()/dimTime,
+                    0
+                )
            )
        );

@ -194,5 +205,3 @@
            new porousZones(fluidRegions[i])
        );
    }
-
-
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@ -74,8 +74,11 @@

    p = p_rgh + rho*gh;

-    // Update pressure time derivative
-    dpdt = fvc::ddt(p);
+    // Update pressure time derivative if needed
+    if (thermo.dpdt())
+    {
+        dpdt = fvc::ddt(p);
+    }

    // Solve continuity
    #include "rhoEqn.H"
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/porousFluid/pPorousFluidEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/porousFluid/pPorousFluidEqn.H
@ -56,6 +56,8 @@ porousU -= rAUPorous*fvc::grad(porousP);
 porousU.correctBoundaryConditions();
 porousK = 0.5*magSqr(porousU);

-// Update pressure time derivative
-porousdpdt = fvc::ddt(porousP);
-
+// Update pressure time derivative if needed
+if (porousThermo.dpdt())
+{
+    porousdpdt = fvc::ddt(porousP);
+}
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@ -111,7 +111,17 @@
    combustion->setTurbulence(turbulence());

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@ -82,4 +82,7 @@ sources.correct(U);

 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
@ -95,7 +95,17 @@
    );

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@ -59,5 +59,8 @@

    K = 0.5*magSqr(U);

-    dpdt = fvc::ddt(p);
+    if (thermo.dpdt())
+    {
+        dpdt = fvc::ddt(p);
+    }
 }
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@ -65,7 +65,17 @@
    combustion->setTurbulence(turbulence());

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@ -49,4 +49,7 @@ p = p_rgh + rho*gh;

 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@ -72,7 +72,17 @@
    combustion->setTurbulence(turbulence());

    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K("K", 0.5*magSqr(U));
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@ -77,4 +77,7 @@ U.correctBoundaryConditions();
 sources.correct(U);
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
@ -77,4 +77,7 @@ U.correctBoundaryConditions();
 sources.correct(U);
 K = 0.5*magSqr(U);

-dpdt = fvc::ddt(p);
+if (thermo.dpdt())
+{
+    dpdt = fvc::ddt(p);
+}
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
@ -374,7 +374,17 @@


    Info<< "Creating field dpdt\n" << endl;
-    volScalarField dpdt("dpdt", fvc::ddt(p));
+    volScalarField dpdt
+    (
+        IOobject
+        (
+            "dpdt",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
+    );

    Info<< "Creating field kinetic energy K\n" << endl;
    volScalarField K1("K1", 0.5*magSqr(U1));
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@ -180,5 +180,8 @@
    K1 = 0.5*magSqr(U1);
    K2 = 0.5*magSqr(U2);

-    dpdt = fvc::ddt(p);
+    //***HGW if (thermo.dpdt())
+    {
+        dpdt = fvc::ddt(p);
+    }
 }
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@ -89,9 +89,10 @@ Foam::basicThermo::basicThermo(const fvMesh& mesh)
        ),
        mesh,
        dimensionSet(1, -1, -1, 0, 0)
-    )
-{}
+    ),

+    dpdt_(lookupOrDefault<Switch>("dpdt", true))
+{}


 Foam::basicThermo::basicThermo
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@ -70,6 +70,8 @@ protected:
            //- Laminar thermal diffusuvity [kg/m/s]
            volScalarField alpha_;

+        //- Should the dpdt term be included in the enthalpy equation
+        Switch dpdt_;

        //- Construct as copy (not implemented)
        basicThermo(const basicThermo&);
@ -120,6 +122,12 @@ public:
        //  i.e. rho = const
        virtual bool isochoric() const = 0;

+        //- Should the dpdt term be included in the enthalpy equation
+        Switch dpdt() const
+        {
+            return dpdt_;
+        }
+

        // Access to thermodynamic state variables

--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@ -25,7 +25,7 @@ Class
    Foam::heThermo

 Description
-    Enthalpy/Internal energy for a mixture based on compressibility
+    Enthalpy/Internal energy for a mixture

 SourceFiles
    heThermo.C
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volVectorField;
-    location    "0";
    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,11 +24,11 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    empty
    {
        type            empty;
    }
 }

-
 // ************************************************************************* //
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      magU;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -32,5 +31,4 @@ boundaryField
    }
 }

-
 // ************************************************************************* //
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p