From dc810ea88d14ee42ed757ff4ab868fbd03b539ee Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 23 Nov 2011 16:56:13 +0000
Subject: [PATCH] Thermodynamics: Completed most of the conversion of the
enthalpy source
---
.../solvers/compressible/rhoPimpleFoam/UEqn.H | 1 +
.../compressible/rhoPimpleFoam/createFields.H | 10 ++---
.../solvers/compressible/rhoPimpleFoam/hEqn.H | 3 +-
.../solvers/compressible/rhoPimpleFoam/pEqn.H | 3 +-
.../rhoPorousMRFPimpleFoam/pEqn.H | 3 +-
.../rhoPorousMRFSimpleFoam/hEqn.H | 3 +-
.../solvers/compressible/sonicFoam/eEqn.H | 2 +-
.../heatTransfer/buoyantPimpleFoam/UEqn.H | 1 +
.../buoyantPimpleFoam/createFields.H | 11 +++---
.../heatTransfer/buoyantPimpleFoam/hEqn.H | 3 +-
.../heatTransfer/buoyantPimpleFoam/pEqn.H | 3 +-
.../fluid/createFluidFields.H | 8 ++--
.../chtMultiRegionSimpleFoam/fluid/pEqn.H | 2 +-
.../fluid/setRegionFluidFields.H | 2 +-
.../solid/setRegionSolidFields.H | 6 +--
.../solid/solveSolid.H | 2 +-
.../chtMultiRegionFoam/fluid/UEqn.H | 3 +-
.../fluid/createFluidFields.H | 38 ++++++++++---------
.../chtMultiRegionFoam/fluid/hEqn.H | 3 +-
.../chtMultiRegionFoam/fluid/pEqn.H | 8 ++--
.../fluid/setRegionFluidFields.H | 5 ++-
.../solid/setRegionSolidFields.H | 8 ++--
.../solid/solidRegionDiffNo.C | 22 +++++------
.../solid/solidRegionDiffNo.H | 4 +-
.../solid/solidRegionDiffusionNo.H | 4 +-
.../chtMultiRegionFoam/solid/solveSolid.H | 2 +-
.../LTSReactingParcelFoam/createFields.H | 17 ---------
.../lagrangian/LTSReactingParcelFoam/hsEqn.H | 2 +-
.../lagrangian/LTSReactingParcelFoam/pEqn.H | 2 -
.../LTSReactingParcelFoam/setPressureWork.H | 13 -------
.../LTSReactingParcelFoam/timeScales.H | 6 +--
.../lagrangian/coalChemistryFoam/UEqn.H | 1 +
.../coalChemistryFoam/createFields.H | 11 +++---
.../lagrangian/coalChemistryFoam/hsEqn.H | 3 +-
.../lagrangian/coalChemistryFoam/pEqn.H | 3 +-
.../lagrangian/reactingParcelFilmFoam/UEqn.H | 1 +
.../reactingParcelFilmFoam/createFields.H | 10 ++---
.../lagrangian/reactingParcelFilmFoam/hsEqn.H | 3 +-
.../lagrangian/reactingParcelFilmFoam/pEqn.H | 3 +-
.../lagrangian/reactingParcelFoam/UEqn.H | 1 +
.../reactingParcelFoam/createFields.H | 12 +++---
.../lagrangian/reactingParcelFoam/hsEqn.H | 9 +++--
.../lagrangian/reactingParcelFoam/pEqn.H | 4 +-
.../compressibleTwoPhaseEulerFoam/TEqns.H | 4 +-
.../createFields.H | 10 +++--
.../compressibleTwoPhaseEulerFoam/pEqn.H | 6 ++-
.../les/pitzDaily/system/fvSchemes | 2 +-
.../ras/angledDuct/system/fvSchemes | 2 +-
.../rhoPimpleFoam/ras/cavity/system/fvSchemes | 2 +-
.../angledDuct/system/fvSchemes | 2 +-
.../mixerVessel2D/system/fvSchemes | 2 +-
.../angledDuctExplicit/system/fvSchemes | 2 +-
.../constant/polyMesh/boundary | 2 +-
.../angledDuctImplicit/system/fvSchemes | 2 +-
.../laminar/forwardStep/system/fvSchemes | 2 +-
.../laminar/shockTube/system/fvSchemes | 2 +-
.../ras/nacaAirfoil/system/fvSchemes | 2 +-
.../sonicFoam/ras/prism/system/fvSchemes | 2 +-
.../hotRoom/system/fvSchemes | 2 +-
.../system/bottomAir/fvSchemes | 2 +-
.../multiRegionHeater/system/topAir/fvSchemes | 2 +-
.../system/bottomWater/fvSchemes | 2 +-
.../system/topAir/fvSchemes | 2 +-
.../system/bottomAir/fvSchemes | 2 +-
.../system/topAir/fvSchemes | 2 +-
.../wingMotion_snappyHexMesh/system/fvSchemes | 2 +-
.../counterFlowFlame2D/system/fvSchemes | 2 +-
.../counterFlowFlame2D/system/fvSolution | 2 -
.../verticalChannel/system/fvSchemes | 2 +-
.../verticalChannel/system/fvSolution | 2 -
.../simplifiedSiwek/system/fvSchemes | 2 +-
.../filter/system/fvSchemes | 2 +-
.../parcelInBox/system/fvSchemes | 2 +-
.../verticalChannel/system/fvSchemes | 2 +-
.../cylinder/system/fvSchemes | 2 +-
.../hotBoxes/system/fvSchemes | 2 +-
.../rivuletPanel/system/fvSchemes | 2 +-
.../splashPanel/system/fvSchemes | 2 +-
.../evaporationTest/system/fvSchemes | 2 +-
.../sprayFoam/aachenBomb/system/fvSchemes | 2 +-
.../bubbleColumn/constant/polyMesh/boundary | 2 +-
.../bubbleColumn/system/fvSchemes | 4 +-
.../fluidisedBed/system/fvSchemes | 4 +-
83 files changed, 173 insertions(+), 186 deletions(-)
delete mode 100644 applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H
diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
index 4688633cb37..1e39e983e42 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H
+++ b/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);
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 070f651a999..e2c7b950de7 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/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));
diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index 3125cc3ffa8..b1d9e4e8b02 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/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();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 15aa4b9300f..f7bb932fdc2 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/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);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
index cb7ecaa29d7..831f139e817 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/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);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
index ff0b91bcb7a..cb989b804f3 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
+++ b/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);
diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H
index 1d1d6aef0b2..6733f528854 100644
--- a/applications/solvers/compressible/sonicFoam/eEqn.H
+++ b/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))
);
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
index 7dff741e663..9597f6ac08d 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
@@ -23,4 +23,5 @@
)*mesh.magSf()
)
);
+ K = 0.5*magSqr(U);
}
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
index e39d0bb8033..1c2a2b94e49 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
+++ b/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));
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H
index 3125cc3ffa8..b1d9e4e8b02 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H
+++ b/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();
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
index 5c60d78b35a..397c1c8bf48 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H
+++ b/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"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index 3d8531e1bb6..14f51f4c507 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -1,7 +1,7 @@
// 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,
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
index 862581ef790..73b72af316a 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ b/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();
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
index 1b6a22db0da..cbad65e1c2b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
+++ b/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];
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
index 179480249d8..7ff98e6211e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ b/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();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
index 4e2a2c7b19b..0df54bea01e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
+++ b/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();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
index 119eeb4fd7d..69a23fa1d2f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
@@ -22,5 +22,6 @@
)*mesh.magSf()
),
mesh.solver(U.select(finalIter))
- );
+ );
+ K = 0.5*magSqr(U);
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index f6788d26eb3..7090319d940 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -1,7 +1,7 @@
// 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())
)
);
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H
index 0bb3c8b47c6..293a2001c0e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H
+++ b/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)
);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index 07ab9c92e81..1df38d15bb6 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/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();
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 81c6d25bb0c..6529c139314 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -2,12 +2,13 @@
basicRhoThermo& thermo = thermoFluid[i];
volScalarField& rho = rhoFluid[i];
- volScalarField& K = KFluid[i];
+ volScalarField& kappa = kappaFluid[i];
volVectorField& U = UFluid[i];
surfaceScalarField& phi = phiFluid[i];
compressible::turbulenceModel& turb = turbulence[i];
- volScalarField& DpDt = DpDtFluid[i];
+ volScalarField& K = KFluid[i];
+ volScalarField& dpdt = dpdtFluid[i];
volScalarField& p = thermo.p();
const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index a843ed8bd75..c013b733db9 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -7,9 +7,9 @@
tmp<volScalarField> tcp = thermo.Cp();
const volScalarField& cp = tcp();
- tmp<volScalarField> tK = thermo.K();
- //tmp<volSymmTensorField> tK = thermo.directionalK();
- const volScalarField& K = tK();
- //const volSymmTensorField& K = tK();
+ tmp<volScalarField> tkappa = thermo.K();
+ //tmp<volSymmTensorField> tkappa = thermo.directionalkappa();
+ const volScalarField& kappa = tkappa();
+ //const volSymmTensorField& kappa = tkappa();
volScalarField& T = thermo.T();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
index 3dbab748583..437ea783274 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
@@ -31,7 +31,7 @@ Foam::scalar Foam::solidRegionDiffNo
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
- const volScalarField& K
+ const volScalarField& kappa
)
{
scalar DiNum = 0.0;
@@ -39,16 +39,16 @@ Foam::scalar Foam::solidRegionDiffNo
//- Take care: can have fluid domains with 0 cells so do not test for
// zero internal faces.
- surfaceScalarField KrhoCpbyDelta
+ surfaceScalarField kapparhoCpbyDelta
(
mesh.surfaceInterpolation::deltaCoeffs()
- * fvc::interpolate(K)
+ * fvc::interpolate(kappa)
/ fvc::interpolate(Cprho)
);
- DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
+ DiNum = gMax(kapparhoCpbyDelta.internalField())*runTime.deltaT().value();
- meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
+ meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value();
Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
<< " max: " << DiNum << endl;
@@ -62,26 +62,26 @@ Foam::scalar Foam::solidRegionDiffNo
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
- const volSymmTensorField& Kdirectional
+ const volSymmTensorField& kappadirectional
)
{
scalar DiNum = 0.0;
scalar meanDiNum = 0.0;
- volScalarField K(mag(Kdirectional));
+ volScalarField kappa(mag(kappadirectional));
//- Take care: can have fluid domains with 0 cells so do not test for
// zero internal faces.
- surfaceScalarField KrhoCpbyDelta
+ surfaceScalarField kapparhoCpbyDelta
(
mesh.surfaceInterpolation::deltaCoeffs()
- * fvc::interpolate(K)
+ * fvc::interpolate(kappa)
/ fvc::interpolate(Cprho)
);
- DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
+ DiNum = gMax(kapparhoCpbyDelta.internalField())*runTime.deltaT().value();
- meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
+ meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value();
Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
<< " max: " << DiNum << endl;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
index 2fe2efa95e1..cb4dd30b6a3 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
@@ -39,7 +39,7 @@ namespace Foam
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
- const volScalarField& K
+ const volScalarField& kappa
);
scalar solidRegionDiffNo
@@ -47,7 +47,7 @@ namespace Foam
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
- const volSymmTensorField& K
+ const volSymmTensorField& kappa
);
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
index 77dc6f04bf4..878780baf1d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H
@@ -2,7 +2,7 @@
forAll(solidRegions, i)
{
-# include "setRegionSolidFields.H"
+ #include "setRegionSolidFields.H"
DiNum = max
(
@@ -11,7 +11,7 @@
solidRegions[i],
runTime,
rho*cp,
- K
+ kappa
),
DiNum
);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
index d8aa03283b4..d7781c4cd9e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@@ -9,7 +9,7 @@ if (finalIter)
tmp<fvScalarMatrix> TEqn
(
fvm::ddt(rho*cp, T)
- - fvm::laplacian(K, T)
+ - fvm::laplacian(kappa, T)
);
TEqn().relax();
TEqn().solve(mesh.solver(T.select(finalIter)));
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H
index f1f6173cd61..264756c8331 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H
@@ -124,20 +124,3 @@
dimensionedScalar("one", dimless/dimTime, 1),
zeroGradientFvPatchScalarField::typeName
);
-
- Info<< "Creating field DpDt\n" << endl;
- volScalarField DpDt
- (
- IOobject
- (
- "DpDt",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- mesh,
- dimensionedScalar("zero", dimPressure/dimTime, 0.0)
- );
-
- #include "setPressureWork.H"
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
index 151e8e60bbb..e8a4da76451 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
@@ -5,7 +5,7 @@
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
==
- DpDt
+ - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
+ parcels.Sh(hs)
+ radiation->Shs(thermo)
+ combustion->Sh()
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
index 27eb76e42fd..141faa30bf2 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
@@ -65,7 +65,5 @@
rho = max(rho, rhoMin);
rho = min(rho, rhoMax);
- #include "setPressureWork.H"
-
Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl;
}
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H
deleted file mode 100644
index c5dd4b74515..00000000000
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H
+++ /dev/null
@@ -1,13 +0,0 @@
-DpDt == dimensionedScalar("zero", DpDt.dimensions(), 0.0);
-
-if (pressureWork)
-{
- surfaceScalarField phiU("phiU", phi/fvc::interpolate(rho));
-
- DpDt += fvc::div(phiU*fvc::interpolate(p)) - p*fvc::div(phiU);
-
- if (pressureWorkTimeDerivative)
- {
- DpDt += fvc::ddt(p);
- }
-}
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
index 43ebced8341..24277a9f45a 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
@@ -74,10 +74,10 @@ Info<< "Time scales min/max:" << endl;
runTime.deltaTValue()
*mag
(
- DpDt
- + parcels.hsTrans()/(mesh.V()*runTime.deltaT())
-// + sources(rho, hs)
+ parcels.hsTrans()/(mesh.V()*runTime.deltaT())
+ // + sources(rho, hs)
+ combustion->Sh()()
+ - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")()
)
/rho
);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
index b7321872c34..fe7b047d9a2 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
@@ -17,4 +17,5 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
+ K = 0.5*magSqr(U);
}
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
index 13e8d94e724..8c786ae251b 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@@ -115,12 +115,11 @@
// Set the turbulence into the combustion model
combustion->setTurbulence(turbulence());
- 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));
Info<< "\nConstructing sources" << endl;
IObasicSourceList sources(mesh);
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
index 6df66134c43..6a28b325600 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
@@ -5,7 +5,8 @@
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
==
- DpDt
+ dpdt
+ - (fvc::ddt(rho, K) + fvc::div(phi, K))
+ combustion->Sh()
+ coalParcels.Sh(hs)
+ limestoneParcels.Sh(hs)
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
index 539521ca9b4..56435d31ce1 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@@ -74,5 +74,6 @@ else
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);
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
index a64e50a2d24..81c587e2438 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
@@ -23,4 +23,5 @@
)*mesh.magSf()
)
);
+ K = 0.5*magSqr(U);
}
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index 999515f4309..345d795a182 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -69,13 +69,11 @@
// Set the turbulence into the combustion model
combustion->setTurbulence(turbulence());
- 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));
Info<< "Calculating field g.h\n" << endl;
volScalarField gh("gh", g & mesh.C());
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/hsEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/hsEqn.H
index 79c5e1c5b3c..a6124813a91 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/hsEqn.H
@@ -5,7 +5,8 @@
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
==
- DpDt
+ dpdt
+ - (fvc::ddt(rho, K) + fvc::div(phi, K))
+ parcels.Sh(hs)
+ surfaceFilm.Sh()
+ radiation->Shs(thermo)
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
index 65259391daf..872a0513a3d 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H
@@ -43,5 +43,6 @@ p = p_rgh + rho*gh;
U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf);
U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
index 31e00d8f35a..eac49bfc331 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
@@ -13,4 +13,5 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
+ K = 0.5*magSqr(U);
}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index c318498d94c..6e764c0d6d5 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -76,13 +76,11 @@
// Set the turbulence into the combustion model
combustion->setTurbulence(turbulence());
- 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));
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
forAll(Y, i)
@@ -103,4 +101,4 @@
),
mesh,
dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
- );
\ No newline at end of file
+ );
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H
index f7499813c7f..12438380aa7 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H
@@ -5,10 +5,11 @@
+ mvConvection->fvmDiv(phi, hs)
- fvm::laplacian(turbulence->alphaEff(), hs)
==
- DpDt
- + parcels.Sh(hs)
- + radiation->Shs(thermo)
- + combustion->Sh()
+ dpdt
+ - (fvc::ddt(rho, K) + fvc::div(phi, K))
+ + parcels.Sh(hs)
+ + radiation->Shs(thermo)
+ + combustion->Sh()
);
hEqn.relax();
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index 8031af20d57..5ee551a0ea5 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -68,6 +68,6 @@ else
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);
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
index 26015141d27..0af1e179462 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H
@@ -11,7 +11,7 @@
==
heatTransferCoeff*T2/Cp1/rho1
- fvm::Sp(heatTransferCoeff/Cp1/rho1, T1)
- + alpha1*Dp1Dt/Cp1/rho1
+ + alpha1*(dpdt - (fvc::ddt(rho1, K1) + fvc::div(phi1, K1)))/Cp1/rho1
);
fvScalarMatrix T2Eqn
@@ -23,7 +23,7 @@
==
heatTransferCoeff*T1/Cp2/rho2
- fvm::Sp(heatTransferCoeff/Cp2/rho2, T2)
- + alpha2*Dp2Dt/Cp2/rho2
+ + alpha2*(dpdt - (fvc::ddt(rho2, K2) + fvc::div(phi2, K2)))/Cp2/rho2
);
T1Eqn.relax();
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
index cd2bc8b6417..b3eca666c26 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H
@@ -357,6 +357,10 @@
volScalarField dgdt =
pos(alpha2)*fvc::div(phi)/max(alpha2, scalar(0.0001));
- Info<< "Creating field DpDt\n" << endl;
- volScalarField Dp1Dt(fvc::DDt(phi1, p));
- volScalarField Dp2Dt(fvc::DDt(phi2, p));
+
+ Info<< "Creating field dpdt\n" << endl;
+ volScalarField dpdt("dpdt", fvc::ddt(p));
+
+ Info<< "Creating field kinetic energy K\n" << endl;
+ volScalarField K1("K1", 0.5*magSqr(U1));
+ volScalarField K2("K2", 0.5*magSqr(U2));
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
index d6af50988fa..6e2fc44b083 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H
@@ -127,6 +127,8 @@
rho1 = rho10 + psi1*p;
rho2 = rho20 + psi2*p;
- Dp1Dt = fvc::DDt(phi1, p);
- Dp2Dt = fvc::DDt(phi2, p);
+ K1 = 0.5*magSqr(U1);
+ K2 = 0.5*magSqr(U1);
+
+ dpdt = fvc::ddt(p);
}
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
index a27a7cb00d8..56aebd7a94f 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
default none;
div(phi,U) Gauss filteredLinear2V 0.2 0;
div(phi,h) Gauss filteredLinear2 0.2 0;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
div(phi,muTilda) Gauss limitedLinear 1;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
index f8198db5e4b..1772c2a3fd2 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
index 459736fe584..3049da2bed4 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phid,p) Gauss limitedLinear 1;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss limitedLinear 1;
div(phi,k) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
index a5ed5fdc754..00981f61fcb 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
index 45e2412652b..dbca5c1607a 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
div(phi,k) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
}
laplacianSchemes
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
index 4f47f1ef0d8..d237bd73617 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
div(phi,h) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
- div(U,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
}
laplacianSchemes
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index 0abd1608aba..a664893343e 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
index 491ee755806..711e4e3233a 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
div(phi,h) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
- div(U,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
}
laplacianSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index 6c0fad8e3e2..b4cf8d2e38d 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
- div(phiU,p) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear 1;
}
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index 6c0fad8e3e2..b4cf8d2e38d 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
- div(phiU,p) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear 1;
}
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index a5fc7790daa..b12dc45dcf6 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phid,p) Gauss limitedLinear 1;
- div(phiU,p) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index 11831249de6..e7b5a41a604 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phid,p) Gauss limitedLinear 1;
- div(phiU,p) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
index 5d814f89ed7..3a7b6154e54 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(R) Gauss linear;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
index 211e990ac15..e4be18c50c4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
index 7d87f15326e..865dfd9f993 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
index 7d87f15326e..865dfd9f993 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
index 7d87f15326e..865dfd9f993 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
index 7d87f15326e..865dfd9f993 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
index 7d87f15326e..865dfd9f993 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
@@ -28,7 +28,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
index a5fc7790daa..b12dc45dcf6 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
@@ -34,7 +34,7 @@ divSchemes
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phid,p) Gauss limitedLinear 1;
- div(phiU,p) Gauss limitedLinear 1;
+ div(phi,K) Gauss limitedLinear 1;
div(phi,e) Gauss limitedLinear 1;
div((muEff*dev2(T(grad(U))))) Gauss linear;
}
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
index ab163d0856e..1718307504e 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phi,Yi_h) Gauss upwind;
div(phi,h) Gauss upwind;
- div(phiU,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
index f653a66ba66..e2d4fcfdeea 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
@@ -92,8 +92,6 @@ PIMPLE
additional
{
- pressureWork true;
- pressureWorkTimeDerivative true;
solveSpecies true;
}
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
index 98dab9606b4..f0c610dcbf4 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
index eb09deb87a1..82179b044e5 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
@@ -79,8 +79,6 @@ PIMPLE
additional
{
- pressureWork true;
- pressureWorkTimeDerivative false; // true;
solveSpecies true;
}
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
index 11223b58184..f2abd9112f3 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
index 11223b58184..f2abd9112f3 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
index 68df90c9089..9b46cd8f1cc 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
index b65a4948da9..7a96d901447 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes
@@ -33,7 +33,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
index 91117027586..57fb0a2e123 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
index e7f90a15fbc..729ed886a08 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
index e7f90a15fbc..729ed886a08 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
index e7f90a15fbc..729ed886a08 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes
@@ -30,7 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss upwind;
- div(phiU,p) Gauss upwind;
+ div(phi,K) Gauss upwind;
div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
index 11223b58184..f2abd9112f3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
index 11223b58184..f2abd9112f3 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes
@@ -31,7 +31,7 @@ divSchemes
default none;
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
+ div(phi,K) Gauss linear;
div(phi,hs) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
index 1bf12fb1ac7..56e0a545c15 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
@@ -1,4 +1,4 @@
-/*--------------------------------*- C++ -*----------------------------------* \
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSchemes
index ab8afe3d4d8..93b115565da 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -44,8 +44,8 @@ divSchemes
div(phi,Theta) Gauss limitedLinear 1;
div(phid1,p) Gauss upwind;
div(phid2,p) Gauss upwind;
- div(phi1,p) Gauss linear;
- div(phi2,p) Gauss linear;
+ div(phi1,K1) Gauss limitedLinearV 1;
+ div(phi2,K2) Gauss limitedLinearV 1;
}
laplacianSchemes
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes
index 99b15f62aa3..27ba67b86d2 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes
@@ -44,8 +44,8 @@ divSchemes
div((alpha2*Rc2)) Gauss linear;
div(phid1,p) Gauss upwind;
div(phid2,p) Gauss upwind;
- div(phi1,p) Gauss linear;
- div(phi2,p) Gauss linear;
+ div(phi1,K1) Gauss limitedLinearV 1;
+ div(phi2,K2) Gauss limitedLinearV 1;
}
laplacianSchemes
--
GitLab