combustion: Removed Qdot field from solvers

The Qdot field has been removed from all reacting solvers, in favour of computing on the fly whenever it is needed. It can still be generated for post-processing purposes by means of the Qdot function object. This change reduces code duplication and storage for all modified solvers. The Qdot function object has been applied to a number of tutorials in order to retain the existing output. A fix to Qdot has also been applied for multi-phase cases.
2019-01-24 11:44:09 +00:00
parent 9847205bfc
commit 4221e43dfc
33 changed files with 69 additions and 143 deletions
--- a/applications/solvers/combustion/fireFoam/YEEqn.H
+++ b/applications/solvers/combustion/fireFoam/YEEqn.H
@ -11,7 +11,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 {
    radiation->correct();
    combustion->correct();
-    Qdot = combustion->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
@ -66,7 +65,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
        )
      - fvm::laplacian(turbulence->alphaEff(), he)
     ==
-        Qdot
+        combustion->Qdot()
      + radiation->Sh(thermo, he)
      + parcels.Sh(he)
      + surfaceFilm.Sh()
--- a/applications/solvers/combustion/fireFoam/createFields.H
+++ b/applications/solvers/combustion/fireFoam/createFields.H
@ -124,20 +124,6 @@ Switch solvePyrolysisRegion
    additionalControlsDict.lookupOrDefault<bool>("solvePyrolysisRegion", true)
 );

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-

 Info<< "Creating field dpdt\n" << endl;
 volScalarField dpdt
--- a/applications/solvers/combustion/reactingFoam/EEqn.H
+++ b/applications/solvers/combustion/reactingFoam/EEqn.H
@ -17,7 +17,7 @@
        )
      - fvm::laplacian(turbulence->alphaEff(), he)
     ==
-        Qdot
+        reaction->Qdot()
      + fvOptions(rho, he)
    );

--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@ -11,7 +11,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection

 {
    reaction->correct();
-    Qdot = reaction->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@ -92,19 +92,5 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createFvOptions.H"
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
@ -114,19 +114,5 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createFvOptions.H"
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
@ -96,19 +96,5 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createFvOptions.H"
--- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H
+++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -80,7 +80,7 @@ License
    {
        volScalarField::Internal rDeltaTT
        (
-            mag(Qdot)/(alphaTemp*rho*thermo.Cp()*T)
+            mag(reaction->Qdot())/(alphaTemp*rho*thermo.Cp()*T)
        );

        Info<< "    Temperature = "
--- a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
@ -18,7 +18,7 @@
      - fvm::laplacian(turbulence->alphaEff(), he)
     ==
        rho*(U&g)
-      + Qdot
+      + combustion->Qdot()
      + coalParcels.Sh(he)
      + limestoneParcels.Sh(he)
      + radiation->Sh(thermo, he)
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@ -12,7 +12,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection

 {
    combustion->correct();
-    Qdot = combustion->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@ -129,20 +129,6 @@ volScalarField dpdt
 Info<< "Creating field kinetic energy K\n" << endl;
 volScalarField K("K", 0.5*magSqr(U));

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createClouds.H"
 #include "createRadiationModel.H"
--- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -80,7 +80,7 @@ License
            (
               (coalParcels.hsTrans() + limestoneParcels.hsTrans())
              /(mesh.V()*runTime.deltaT())
-             + Qdot
+             + combustion->Qdot()()
            )
           /(
               alphaTemp
--- a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
@ -21,7 +21,7 @@
      + parcels.Sh(he)
      + surfaceFilm.Sh()
      + radiation->Sh(thermo, he)
-      + Qdot
+      + combustion->Qdot()
      + fvOptions(rho, he)
    );

--- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
@ -12,7 +12,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection

 {
    combustion->correct();
-    Qdot = combustion->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@ -117,20 +117,6 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createRadiationModel.H"
 #include "createClouds.H"
--- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -79,7 +79,7 @@ License
            mag
            (
               parcels.hsTrans()/(mesh.V()*runTime.deltaT())
-             + Qdot
+             + combustion->Qdot()()
            )
           /(
               alphaTemp
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H
@ -14,7 +14,7 @@
        rho*(U&g)
      + parcels.Sh(he)
      + radiation->Sh(thermo, he)
-      + Qdot
+      + combustion->Qdot()
      + fvOptions(rho, he)
    );

--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H
@ -11,7 +11,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection

 {
    combustion->correct();
-    Qdot = combustion->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@ -99,20 +99,6 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createRadiationModel.H"
 #include "createClouds.H"
--- a/applications/solvers/lagrangian/sprayFoam/EEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/EEqn.H
@ -20,7 +20,7 @@
        rho*(U&g)
      + parcels.Sh(he)
      + radiation->Sh(thermo, he)
-      + Qdot
+      + combustion->Qdot()
      + fvOptions(rho, he)
    );

--- a/applications/solvers/lagrangian/sprayFoam/YEqn.H
+++ b/applications/solvers/lagrangian/sprayFoam/YEqn.H
@ -11,7 +11,6 @@ tmp<fv::convectionScheme<scalar>> mvConvection

 {
    combustion->correct();
-    Qdot = combustion->Qdot();
    volScalarField Yt(0.0*Y[0]);

    forAll(Y, i)
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@ -115,20 +115,6 @@ forAll(Y, i)
 }
 fields.add(thermo.he());

-volScalarField Qdot
-(
-    IOobject
-    (
-        "Qdot",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
-);
-
 #include "createMRF.H"
 #include "createClouds.H"
 #include "createRadiationModel.H"
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -108,11 +108,6 @@ int main(int argc, char *argv[])

        rho = thermo.rho();

-        if (runTime.write())
-        {
-            combustion->Qdot()().write();
-        }
-
        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
            << nl << endl;
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@ -148,11 +148,6 @@ int main(int argc, char *argv[])

        rho = thermo.rho();

-        if (runTime.write())
-        {
-            combustion->Qdot()().write();
-        }
-
        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
            << nl << endl;
--- a/src/combustionModels/functionObjects/Qdot/Qdot.C
+++ b/src/combustionModels/functionObjects/Qdot/Qdot.C
@ -60,7 +60,7 @@ Foam::functionObjects::Qdot::Qdot
    phaseName_(word::null)
 {
    read(dict);
-    resetLocalObjectName(type());
+    resetLocalObjectName(IOobject::groupName(type(), phaseName_));
 }


--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/system/controlDict
@ -49,5 +49,10 @@ adjustTimeStep  yes;

 maxCo           0.4;

+functions
+{
+    #includeFunc Qdot
+}
+

 // ************************************************************************* //
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/system/controlDict
@ -45,4 +45,10 @@ timePrecision   6;

 runTimeModifiable true;

+functions
+{
+    #includeFunc Qdot
+}
+
+
 // ************************************************************************* //
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/system/controlDict
@ -45,4 +45,10 @@ timePrecision   6;

 runTimeModifiable true;

+functions
+{
+    #includeFunc Qdot
+}
+
+
 // ************************************************************************* //
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/system/controlDict
@ -49,5 +49,10 @@ adjustTimeStep  yes;

 maxCo           0.4;

+functions
+{
+    #includeFunc Qdot
+}
+

 // ************************************************************************* //
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/system/controlDict
@ -49,5 +49,10 @@ adjustTimeStep  yes;

 maxCo           0.4;

+functions
+{
+    #includeFunc Qdot
+}
+

 // ************************************************************************* //
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict
@ -49,5 +49,10 @@ maxCo           0.1;

 runTimeModifiable yes;

+functions
+{
+    #includeFunc Qdot
+}
+

 // ************************************************************************* //
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/Qdot
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/Qdot
@ -0,0 +1,17 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+Description
+    Calculates the heat release rate Qdot, outputting the data as a Qdot field.
+
+\*---------------------------------------------------------------------------*/
+
+#includeEtc "caseDicts/postProcessing/combustion/Qdot.cfg"
+
+phase gas;
+
+// ************************************************************************* //
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict
@ -51,5 +51,10 @@ maxCo           0.5;

 maxDeltaT       1;

+functions
+{
+    #includeFunc Qdot
+}
+

 // ************************************************************************* //