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

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -14,4 +14,5 @@ volScalarField rAU(1.0/UEqn().A());
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
+    K = 0.5*magSqr(U);
 }

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -54,8 +54,8 @@
         )
     );
 
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
+    Info<< "Creating field dpdt\n" << endl;
+    volScalarField dpdt("dpdt", fvc::ddt(p));
+
+    Info<< "Creating field kinetic energy K\n" << endl;
+    volScalarField K("K", 0.5*magSqr(U));

applications/solvers/compressible/rhoPimpleFoam/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
     );
 
     hEqn.relax();

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -83,5 +83,6 @@ Info<< "rho max/min : " << max(rho).value()
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H

@@ -85,5 +85,6 @@ Info<< "rho max/min : " << max(rho).value()
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H

@@ -5,8 +5,7 @@
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)")
-      - (rho/psi)*fvc::div(phi/fvc::interpolate(rho))
+      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
     );
 
     pZones.addEnthalpySource(thermo, rho, hEqn);

applications/solvers/compressible/sonicFoam/eEqn.H

@@ -4,7 +4,7 @@
         fvm::ddt(rho, e)
       + fvm::div(phi, e)
       - fvm::laplacian(turbulence->alphaEff(), e)
-      ==
+     ==
       - p*fvc::div(phi/fvc::interpolate(rho))
     );
 

applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H

@@ -23,4 +23,5 @@
                 )*mesh.magSf()
             )
         );
+        K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -74,9 +74,8 @@
     // Force p_rgh to be consistent with p
     p_rgh = p - rho*gh;
 
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        "DpDt",
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
+    Info<< "Creating field dpdt\n" << endl;
+    volScalarField dpdt("dpdt", fvc::ddt(p));
+
+    Info<< "Creating field kinetic energy K\n" << endl;
+    volScalarField K("K", 0.5*magSqr(U));

applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
     );
 
     hEqn.relax();

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -47,6 +47,7 @@
             // calculated from the relaxed pressure
             U += rAU*fvc::reconstruct((buoyancyPhi + p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
+            K = 0.5*magSqr(U);
         }
     }
 
@@ -55,7 +56,7 @@
     // Second part of thermodynamic density update
     thermo.rho() += psi*p_rgh;
 
-    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+    dpdt = fvc::ddt(p);
 
     #include "rhoEqn.H"
     #include "compressibleContinuityErrs.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H

     // Initialise fluid field pointer lists
     PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -50,15 +50,15 @@
             )
         );
 
-        Info<< "    Adding to KFluid\n" << endl;
-        KFluid.set
+        Info<< "    Adding to kappaFluid\n" << endl;
+        kappaFluid.set
         (
             i,
             new volScalarField
             (
                 IOobject
                 (
-                    "K",
+                    "kappa",
                     runTime.timeName(),
                     fluidRegions[i],
                     IOobject::NO_READ,

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H

@@ -71,5 +71,5 @@
         << max(rho).value() << endl;
 
     // Update thermal conductivity
-    K = thermo.Cp()*turb.alphaEff();
+    kappa = thermo.Cp()*turb.alphaEff();
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H

@@ -2,7 +2,7 @@
 
     basicRhoThermo& thermo = thermoFluid[i];
     volScalarField& rho = rhoFluid[i];
-    volScalarField& K = KFluid[i];
+    volScalarField& kappa = kappaFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H

@@ -7,8 +7,8 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tK = thermo.K();
-    //tmp<volSymmTensorField> tK = thermo.directionalK();
-    const volScalarField& K = tK();
+    tmp<volScalarField> tkappa = thermo.K();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalkappa();
+    const volScalarField& kappa = tkappa();
 
     volScalarField& T = thermo.T();

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H

@@ -3,7 +3,7 @@
     {
         fvScalarMatrix tEqn
         (
-            -fvm::laplacian(K, T)
+            -fvm::laplacian(kappa, T)
         );
         tEqn.relax();
         tEqn.solve();

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H

@@ -22,5 +22,6 @@
                 )*mesh.magSf()
             ),
             mesh.solver(U.select(finalIter))
-        );
+         );
+         K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

     // Initialise fluid field pointer lists
     PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -10,7 +10,8 @@
     PtrList<volScalarField> ghFluid(fluidRegions.size());
     PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
     PtrList<radiation::radiationModel> radiation(fluidRegions.size());
-    PtrList<volScalarField> DpDtFluid(fluidRegions.size());
+    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> dpdtFluid(fluidRegions.size());
 
     List<scalar> initialMassFluid(fluidRegions.size());
 
@@ -45,15 +46,15 @@
             )
         );
 
-        Info<< "    Adding to KFluid\n" << endl;
-        KFluid.set
+        Info<< "    Adding to kappaFluid\n" << endl;
+        kappaFluid.set
         (
             i,
             new volScalarField
             (
                 IOobject
                 (
-                    "K",
+                    "kappa",
                     runTime.timeName(),
                     fluidRegions[i],
                     IOobject::NO_READ,
@@ -175,22 +176,25 @@
 
         initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();
 
-        Info<< "    Adding to DpDtFluid\n" << endl;
-        DpDtFluid.set
+        Info<< "    Adding to KFluid\n" << endl;
+        KFluid.set
         (
             i,
             new volScalarField
             (
-                "DpDt",
-                fvc::DDt
-                (
-                    surfaceScalarField
-                    (
-                        "phiU",
-                        phiFluid[i]/fvc::interpolate(rhoFluid[i])
-                    ),
-                    thermoFluid[i].p()
-                )
+                "K",
+                0.5*magSqr(UFluid[i])
+            )
+        );
+
+        Info<< "    Adding to dpdtFluid\n" << endl;
+        dpdtFluid.set
+        (
+            i,
+            new volScalarField
+            (
+                "dpdt",
+                fvc::ddt(thermoFluid[i].p())
             )
         );
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turb.alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + rad.Sh(thermo)
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -68,11 +68,13 @@
     // Correct velocity field
     U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf);
     U.correctBoundaryConditions();
+    K = 0.5*magSqr(U);
 
     p = p_rgh + rho*gh;
 
-    // Update pressure substantive derivative
-    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+    // Update pressure time derivative
+    dpdt = fvc::ddt(p);
+
 
     // Solve continuity
     #include "rhoEqn.H"
@@ -91,5 +93,5 @@
     }
 
     // Update thermal conductivity
-    K = thermoFluid[i].Cp()*turb.alphaEff();
+    kappa = thermoFluid[i].Cp()*turb.alphaEff();
 }