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

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));

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);
+}

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));

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);
+}

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));

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);
+}

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));

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);
+}

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));

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);
+}

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));

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);
+    }
 }

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));

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);
+}

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();

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);
+}

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));

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"

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])
         );
     }
-
-

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"