From 09aa9fbeb2a8670c120842a0767cc0b40d9bdd9f Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 16 Jul 2012 09:49:04 +0100 Subject: [PATCH] rhoPorousMRFSimpleFoam: Changed to rhoThermo Also renamed addEnthalpySource -> addEnergySource --- .../solvers/compressible/rhoSimpleFoam/pEqn.H | 194 +++++++++--------- .../rhoPorousMRFSimpleFoam/createFields.H | 61 ++++++ .../rhoPorousMRFSimpleFoam/eEqn.H | 3 +- .../rhoPorousMRFSimpleFoam/pEqn.H | 123 +++++------ .../rhoPorousMRFSimpleFoam.C | 2 +- .../porousFluid/pPorousFluidEqn.H | 1 - .../mixtures/basicMixture/basicMixtures.C | 126 ++++++++---- .../psiThermo/hePsiThermo/hePsiThermos.C | 40 ++-- .../rhoThermo/heRhoThermo/heRhoThermos.C | 98 +++++++++ .../fixedTemperature/fixedTemperature.C | 2 +- .../fixedTemperature/fixedTemperature.H | 5 +- .../noThermalModel/noThermalModel.C | 4 +- .../noThermalModel/noThermalModel.H | 5 +- .../thermalModel/thermalModel/thermalModel.H | 5 +- .../thermalPorousZone/thermalPorousZone.C | 6 +- .../thermalPorousZone/thermalPorousZone.H | 4 +- .../thermalPorousZone/thermalPorousZones.C | 6 +- .../thermalPorousZone/thermalPorousZones.H | 4 +- 18 files changed, 430 insertions(+), 259 deletions(-) create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H index 6c64056be2..4d7334c5f8 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H @@ -1,98 +1,102 @@ -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); - -volScalarField rAU(1.0/UEqn().A()); -volVectorField HbyA("HbyA", U); -HbyA = rAU*UEqn().H(); - -UEqn.clear(); - -bool closedVolume = false; - -if (simple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf()) - ); - - while (simple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::div(phid, p) - - fvm::laplacian(rho*rAU, p) - ); - - // Relax the pressure equation to ensure diagonal-dominance - pEqn.relax(); - - pEqn.setReference(pRefCell, pRefValue); - - pEqn.solve(); - - if (simple.finalNonOrthogonalIter()) - { - phi == pEqn.flux(); - } - } -} -else -{ - surfaceScalarField phiHbyA - ( - "phiHbyA", - fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) - ); - - closedVolume = adjustPhi(phiHbyA, U, p); - - while (simple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvc::div(phiHbyA) - - fvm::laplacian(rho*rAU, p) - ); - - pEqn.setReference(pRefCell, pRefValue); - - pEqn.solve(); - - if (simple.finalNonOrthogonalIter()) - { - phi = phiHbyA + pEqn.flux(); - } - } -} - - -#include "incompressible/continuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -U = HbyA - rAU*fvc::grad(p); -U.correctBoundaryConditions(); - -// For closed-volume cases adjust the pressure and density levels -// to obey overall mass continuity -if (closedVolume) -{ - p += (initialMass - fvc::domainIntegrate(psi*p)) - /fvc::domainIntegrate(psi); -} - -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); - -if (!simple.transonic()) { + rho = thermo.rho(); + rho = max(rho, rhoMin); + rho = min(rho, rhoMax); rho.relax(); -} -Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl; + volScalarField rAU(1.0/UEqn().A()); + volVectorField HbyA("HbyA", U); + HbyA = rAU*UEqn().H(); + + UEqn.clear(); + + bool closedVolume = false; + + if (simple.transonic()) + { + surfaceScalarField phid + ( + "phid", + fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf()) + ); + + while (simple.correctNonOrthogonal()) + { + fvScalarMatrix pEqn + ( + fvm::div(phid, p) + - fvm::laplacian(rho*rAU, p) + ); + + // Relax the pressure equation to ensure diagonal-dominance + pEqn.relax(); + + pEqn.setReference(pRefCell, pRefValue); + + pEqn.solve(); + + if (simple.finalNonOrthogonalIter()) + { + phi == pEqn.flux(); + } + } + } + else + { + surfaceScalarField phiHbyA + ( + "phiHbyA", + fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf()) + ); + + closedVolume = adjustPhi(phiHbyA, U, p); + + while (simple.correctNonOrthogonal()) + { + fvScalarMatrix pEqn + ( + fvc::div(phiHbyA) + - fvm::laplacian(rho*rAU, p) + ); + + pEqn.setReference(pRefCell, pRefValue); + + pEqn.solve(); + + if (simple.finalNonOrthogonalIter()) + { + phi = phiHbyA + pEqn.flux(); + } + } + } + + + #include "incompressible/continuityErrs.H" + + // Explicitly relax pressure for momentum corrector + p.relax(); + + U = HbyA - rAU*fvc::grad(p); + U.correctBoundaryConditions(); + + // For closed-volume cases adjust the pressure and density levels + // to obey overall mass continuity + if (closedVolume) + { + p += (initialMass - fvc::domainIntegrate(psi*p)) + /fvc::domainIntegrate(psi); + } + + rho = thermo.rho(); + rho = max(rho, rhoMin); + rho = min(rho, rhoMax); + + if (!simple.transonic()) + { + rho.relax(); + } + + Info<< "rho max/min : " + << max(rho).value() << " " + << min(rho).value() << endl; +} diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H new file mode 100644 index 0000000000..96bdb2a122 --- /dev/null +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H @@ -0,0 +1,61 @@ + Info<< "Reading thermophysical properties\n" << endl; + + autoPtr pThermo + ( + rhoThermo::New(mesh) + ); + rhoThermo& thermo = pThermo(); + + volScalarField rho + ( + IOobject + ( + "rho", + runTime.timeName(), + mesh, + IOobject::READ_IF_PRESENT, + IOobject::AUTO_WRITE + ), + thermo.rho() + ); + + volScalarField& p = thermo.p(); + volScalarField& e = thermo.he(); + + Info<< "Reading field U\n" << endl; + volVectorField U + ( + IOobject + ( + "U", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + mesh + ); + + #include "compressibleCreatePhi.H" + + + label pRefCell = 0; + scalar pRefValue = 0.0; + setRefCell(p, simple.dict(), pRefCell, pRefValue); + + dimensionedScalar rhoMax(simple.dict().lookup("rhoMax")); + dimensionedScalar rhoMin(simple.dict().lookup("rhoMin")); + + Info<< "Creating turbulence model\n" << endl; + autoPtr turbulence + ( + compressible::RASModel::New + ( + rho, + U, + phi, + thermo + ) + ); + + dimensionedScalar initialMass = fvc::domainIntegrate(rho); diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H index 4791062d35..5d0f174623 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H @@ -1,4 +1,5 @@ { + // Kinetic + pressure energy volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho); fvScalarMatrix eEqn @@ -10,7 +11,7 @@ fvc::div(phi)*Ekp - fvc::div(phi, Ekp) ); - //pZones.addEnergySource(thermo, rho, eEqn); + pZones.addEnergySource(thermo, rho, eEqn); eEqn.relax(); eEqn.solve(); diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H index c3e0a43a15..81b194823c 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H @@ -1,52 +1,24 @@ -volVectorField HbyA("HbyA", U); - -if (pressureImplicitPorosity) { - HbyA = trTU() & UEqn().H(); -} -else -{ - HbyA = trAU()*UEqn().H(); -} + rho = thermo.rho(); + rho = max(rho, rhoMin); + rho = min(rho, rhoMax); + rho.relax(); -UEqn.clear(); + volVectorField HbyA("HbyA", U); -bool closedVolume = false; - -if (simple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf()) - ); - mrfZones.relativeFlux(fvc::interpolate(psi), phid); - - while (simple.correctNonOrthogonal()) + if (pressureImplicitPorosity) { - tmp tpEqn; - - if (pressureImplicitPorosity) - { - tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trTU(), p)); - } - else - { - tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trAU(), p)); - } - - tpEqn().setReference(pRefCell, pRefValue); - - tpEqn().solve(); - - if (simple.finalNonOrthogonalIter()) - { - phi == tpEqn().flux(); - } + HbyA = trTU() & UEqn().H(); } -} -else -{ + else + { + HbyA = trAU()*UEqn().H(); + } + + UEqn.clear(); + + bool closedVolume = false; + surfaceScalarField phiHbyA ( "phiHbyA", @@ -79,34 +51,37 @@ else phi = phiHbyA - tpEqn().flux(); } } + + #include "incompressible/continuityErrs.H" + + // Explicitly relax pressure for momentum corrector + p.relax(); + + if (pressureImplicitPorosity) + { + U = HbyA - (trTU() & fvc::grad(p)); + } + else + { + U = HbyA - trAU()*fvc::grad(p); + } + + U.correctBoundaryConditions(); + + // For closed-volume cases adjust the pressure and density levels + // to obey overall mass continuity + if (closedVolume) + { + const volScalarField& psi = thermo.psi(); + p += (initialMass - fvc::domainIntegrate(psi*p)) + /fvc::domainIntegrate(psi); + } + + rho = thermo.rho(); + rho = max(rho, rhoMin); + rho = min(rho, rhoMax); + rho.relax(); + Info<< "rho max/min : " + << max(rho).value() << " " + << min(rho).value() << endl; } - -#include "incompressible/continuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -if (pressureImplicitPorosity) -{ - U = HbyA - (trTU() & fvc::grad(p)); -} -else -{ - U = HbyA - trAU()*fvc::grad(p); -} - -U.correctBoundaryConditions(); - -// For closed-volume cases adjust the pressure and density levels -// to obey overall mass continuity -if (closedVolume) -{ - p += (initialMass - fvc::domainIntegrate(psi*p)) - /fvc::domainIntegrate(psi); -} - -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); -Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl; diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C index 9238106885..22a58da1cc 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiThermo.H" +#include "rhoThermo.H" #include "RASModel.H" #include "MRFZones.H" #include "thermalPorousZones.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H index ca338975fb..9051805b87 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H @@ -16,7 +16,6 @@ porousPhi = for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) { - fvScalarMatrix pEqn ( fvm::laplacian(porousRho*rAUPorous, porousP) == fvc::div(porousPhi) diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C index bb09e15803..248bbed9fe 100644 --- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C +++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C @@ -61,51 +61,6 @@ namespace Foam /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ -makeBasicMixture -( - pureMixture, - constTransport, - sensibleInternalEnergy, - eConstThermo, - perfectGas -); - -makeBasicMixture -( - pureMixture, - sutherlandTransport, - sensibleInternalEnergy, - eConstThermo, - perfectGas -); - -makeBasicMixture -( - pureMixture, - constTransport, - sensibleInternalEnergy, - hConstThermo, - perfectGas -); - -makeBasicMixture -( - pureMixture, - sutherlandTransport, - sensibleInternalEnergy, - hConstThermo, - perfectGas -); - -makeBasicMixture -( - pureMixture, - sutherlandTransport, - sensibleInternalEnergy, - janafThermo, - perfectGas -); - makeBasicMixture ( pureMixture, @@ -185,6 +140,87 @@ makeBasicMixture ); +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeBasicMixture +( + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + perfectGas +); + +makeBasicMixture +( + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + hConstThermo, + perfectGas +); + +makeBasicMixture +( + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + janafThermo, + perfectGas +); + +makeBasicMixture +( + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + incompressible +); + +makeBasicPolyMixture +( + pureMixture, + 3, + sensibleInternalEnergy +); + +makeBasicPolyMixture +( + pureMixture, + 8, + sensibleInternalEnergy +); + + +makeBasicMixture +( + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + isobaricPerfectGas +); + +makeBasicMixture +( + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + hConstThermo, + isobaricPerfectGas +); + +makeBasicMixture +( + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + janafThermo, + isobaricPerfectGas +); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C index b5a48fc315..56baf3fa0b 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C +++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C @@ -84,27 +84,27 @@ makeThermo /* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */ -makeThermo -( - psiThermo, - hePsiThermo, - pureMixture, - constTransport, - sensibleInternalEnergy, - eConstThermo, - perfectGas -); +// makeThermo +// ( +// psiThermo, +// hePsiThermo, +// pureMixture, +// constTransport, +// sensibleInternalEnergy, +// eConstThermo, +// perfectGas +// ); -makeThermo -( - psiThermo, - hePsiThermo, - pureMixture, - sutherlandTransport, - sensibleInternalEnergy, - eConstThermo, - perfectGas -); +// makeThermo +// ( +// psiThermo, +// hePsiThermo, +// pureMixture, +// sutherlandTransport, +// sensibleInternalEnergy, +// eConstThermo, +// perfectGas +// ); makeThermo ( diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C index c4045c70db..e9272e97b8 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C @@ -149,6 +149,104 @@ makeThermo ); +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + perfectGas +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + hConstThermo, + perfectGas +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + janafThermo, + perfectGas +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + incompressible +); + +makePolyThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + 3, + sensibleInternalEnergy +); + +makePolyThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + 8, + sensibleInternalEnergy +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + constTransport, + sensibleInternalEnergy, + hConstThermo, + isobaricPerfectGas +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + hConstThermo, + isobaricPerfectGas +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + sutherlandTransport, + sensibleInternalEnergy, + janafThermo, + isobaricPerfectGas +); + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C index 152c075bfe..47cfe67dcd 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C @@ -64,7 +64,7 @@ Foam::porousMedia::fixedTemperature::~fixedTemperature() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::porousMedia::fixedTemperature::addEnthalpySource +void Foam::porousMedia::fixedTemperature::addEnergySource ( const basicThermo& thermo, const volScalarField& rho, diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H index a09e9eae89..b8932dd2e4 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ public: // Member Functions //- Add the thermal source to the enthalpy equation - virtual void addEnthalpySource + virtual void addEnergySource ( const basicThermo&, const volScalarField& rho, @@ -100,4 +100,3 @@ public: #endif // ************************************************************************* // - diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C index 3f172395cf..7a5a1be53e 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,7 +63,7 @@ Foam::porousMedia::noThermalModel::~noThermalModel() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::porousMedia::noThermalModel::addEnthalpySource +void Foam::porousMedia::noThermalModel::addEnergySource ( const basicThermo&, const volScalarField&, diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H index 5fec230046..bad8b4dae0 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ public: // Member Functions //- Add the thermal source to the enthalpy equation - virtual void addEnthalpySource + virtual void addEnergySource ( const basicThermo&, const volScalarField& rho, @@ -92,4 +92,3 @@ public: #endif // ************************************************************************* // - diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H index b4ededc452..35d2965a7a 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ public: // Member Functions //- Add the thermal source to the enthalpy equation - virtual void addEnthalpySource + virtual void addEnergySource ( const basicThermo&, const volScalarField& rho, @@ -127,4 +127,3 @@ public: #endif // ************************************************************************* // - diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C index 79bdea0b4c..befa29b013 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ Foam::thermalPorousZone::thermalPorousZone // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::thermalPorousZone::addEnthalpySource +void Foam::thermalPorousZone::addEnergySource ( const basicThermo& thermo, const volScalarField& rho, @@ -53,7 +53,7 @@ void Foam::thermalPorousZone::addEnthalpySource { if (model_.valid()) { - model_->addEnthalpySource(thermo, rho, hEqn); + model_->addEnergySource(thermo, rho, hEqn); } } diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H index 1ebf6d0f7d..4356f87cdf 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,7 +125,7 @@ public: // Member Functions //- Add the thermal source to the enthalpy equation - void addEnthalpySource + void addEnergySource ( const basicThermo&, const volScalarField& rho, diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C index cb7d1f5902..1e0da4b7a6 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ Foam::thermalPorousZones::thermalPorousZones // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::thermalPorousZones::addEnthalpySource +void Foam::thermalPorousZones::addEnergySource ( const basicThermo& thermo, const volScalarField& rho, @@ -55,7 +55,7 @@ void Foam::thermalPorousZones::addEnthalpySource { forAll(*this, i) { - operator[](i).addEnthalpySource(thermo, rho, hEqn); + operator[](i).addEnergySource(thermo, rho, hEqn); } } diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H index dacd445830..d30a38b299 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,7 +93,7 @@ public: // Member Functions //- Add the thermal source to the enthalpy equation - void addEnthalpySource + void addEnergySource ( const basicThermo&, const volScalarField& rho,