From e156d196108d60e3148e34b091bb20774df03c95 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 4 May 2012 14:48:46 +0100
Subject: [PATCH] rhoSimpleFoam family: updated to use e rather than h
---
.../compressible/rhoSimpleFoam/createFields.H | 2 +-
.../solvers/compressible/rhoSimpleFoam/hEqn.H | 17 -----------------
.../rhoPorousMRFSimpleFoam/hEqn.H | 18 ------------------
.../rhoPorousMRFSimpleFoam.C | 2 +-
.../compressible/rhoSimpleFoam/rhoSimpleFoam.C | 2 +-
.../rhoSimplecFoam/rhoSimplecFoam.C | 2 +-
6 files changed, 4 insertions(+), 39 deletions(-)
delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/hEqn.H
delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 27bfb831331..8a7d636f99a 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -20,7 +20,7 @@
);
volScalarField& p = thermo.p();
- volScalarField& h = thermo.h();
+ volScalarField& e = thermo.e();
const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
deleted file mode 100644
index 92cea341ca6..00000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- volScalarField K("K", 0.5*magSqr(U));
-
- fvScalarMatrix hEqn
- (
- fvm::div(phi, h)
- - fvm::Sp(fvc::div(phi), h)
- - fvm::laplacian(turbulence->alphaEff(), h)
- ==
- fvc::div(phi)*K - fvc::div(phi, K)
- );
-
- hEqn.relax();
- hEqn.solve();
-
- thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
deleted file mode 100644
index cb989b804f3..00000000000
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- fvScalarMatrix hEqn
- (
- fvm::div(phi, h)
- - fvm::Sp(fvc::div(phi), h)
- - fvm::laplacian(turbulence->alphaEff(), h)
- ==
- - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
- );
-
- pZones.addEnthalpySource(thermo, rho, hEqn);
-
- hEqn.relax();
-
- hEqn.solve();
-
- thermo.correct();
-}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
index 1cb421e5f41..ff642413e0a 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
// Pressure-velocity SIMPLE corrector
{
#include "UEqn.H"
- #include "hEqn.H"
+ #include "eEqn.H"
#include "pEqn.H"
}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index e87a35fab27..d16a2264f4e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// Pressure-velocity SIMPLE corrector
{
#include "UEqn.H"
- #include "hEqn.H"
+ #include "eEqn.H"
#include "pEqn.H"
}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
index 37334e79554..198b5eea40c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
// Velocity-pressure-enthalpy SIMPLEC corrector
{
#include "UEqn.H"
+ #include "eEqn.H"
#include "pEqn.H"
- #include "hEqn.H"
}
turbulence->correct();
--
GitLab