From 9626afd9f8c2c2b8a1ee480f46372596de7ad96b Mon Sep 17 00:00:00 2001 From: ignis Date: Tue, 23 Jan 2018 17:48:43 +0900 Subject: [PATCH] removed old EDM implementation --- src/combustionModels/EDM/EDM.C | 195 ------------------ src/combustionModels/EDM/EDM.H | 143 ------------- src/combustionModels/EDM/EDMs.C | 38 ---- src/combustionModels/Make/files | 2 - .../psiChemistryCombustion.C | 6 - .../psiChemistryCombustion.H | 2 - .../rhoChemistryCombustion.C | 5 - .../rhoChemistryCombustion.H | 2 - 8 files changed, 393 deletions(-) delete mode 100644 src/combustionModels/EDM/EDM.C delete mode 100644 src/combustionModels/EDM/EDM.H delete mode 100644 src/combustionModels/EDM/EDMs.C diff --git a/src/combustionModels/EDM/EDM.C b/src/combustionModels/EDM/EDM.C deleted file mode 100644 index 995bd7a1b..000000000 --- a/src/combustionModels/EDM/EDM.C +++ /dev/null @@ -1,195 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "EDM.H" -#include "fvmSup.H" -#include "localEulerDdtScheme.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - - -template -Foam::combustionModels::EDM::EDM -( - const word& modelType, - const fvMesh& mesh, - const word& phaseName -) -: - Type(modelType, mesh, phaseName), - finiteRate_ - ( - this->coeffs().lookupOrDefault("finiteRate", false) - ), - A_ - ( - this->coeffs().lookupOrDefault("A", 4.0) - ), - B_ - ( - this->coeffs().lookupOrDefault("B",0.5) - ) -{ - if (finiteRate_) - { - Info<< " using Finite-rate/Eddy Dissipation Model" << endl; - Info<< " A = "<phaseName_), - this->mesh().time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh(), - dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) - ) - ); - - if (this->active()) - { - tdQ.ref() = this->chemistryPtr_->dQ(); - } - - return tdQ; -} - - -template -Foam::tmp -Foam::combustionModels::EDM::Sh() const -{ - tmp tSh - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName(typeName + ":Sh", this->phaseName_), - this->mesh().time().timeName(), - this->mesh(), - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh(), - dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0.0) - ) - ); - - if (this->active()) - { - tSh.ref() = this->chemistryPtr_->Sh(); - } - - return tSh; -} - - -template -bool Foam::combustionModels::EDM::read() -{ - if (Type::read()) - { - this->coeffs().lookup("finiteRate") - >> finiteRate_; - return true; - } - else - { - return false; - } -} - - -// ************************************************************************* // diff --git a/src/combustionModels/EDM/EDM.H b/src/combustionModels/EDM/EDM.H deleted file mode 100644 index 56ca3933e..000000000 --- a/src/combustionModels/EDM/EDM.H +++ /dev/null @@ -1,143 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::combustionModels::EDM - -Description - Eddy dissipation model with finite-rate chemistry. - 28.Feb.2017 - Combustion Lab. POSTECH - Karam Han - (Version upgraded by Jinwoo Park) - -SourceFiles - EDM.C - -\*---------------------------------------------------------------------------*/ - -#ifndef EDM_H -#define EDM_H - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace combustionModels -{ - -/*---------------------------------------------------------------------------*\ - Class EDM Declaration -\*---------------------------------------------------------------------------*/ - -template -class EDM -: - public Type -{ - // Private data - - //- Select EDM or finite-rate/EDM - bool finiteRate_; - scalar A_; - scalar B_; - -protected: - - // Protected Member Functions - - //- Return the chemical time scale - tmp tc() const; - -private: - - // Private Member Functions - - //- Disallow copy construct - EDM(const EDM&); - - //- Disallow default bitwise assignment - void operator=(const EDM&); - - -public: - - //- Runtime type information - TypeName("EDM"); - - - // Constructors - - //- Construct from components - EDM - ( - const word& modelType, - const fvMesh& mesh, - const word& phaseName - ); - - - //- Destructor - virtual ~EDM(); - - - // Member Functions - - // Evolution - - //- Correct combustion rate - virtual void correct(); - - //- Fuel consumption rate matrix. - virtual tmp R(volScalarField& Y) const; - - //- Heat release rate calculated from fuel consumption rate matrix - virtual tmp dQ() const; - - //- Return source for enthalpy equation [kg/m/s3] - virtual tmp Sh() const; - - - // IO - - //- Update properties from given dictionary - virtual bool read(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace combustionModels -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "EDM.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/combustionModels/EDM/EDMs.C b/src/combustionModels/EDM/EDMs.C deleted file mode 100644 index f89e01382..000000000 --- a/src/combustionModels/EDM/EDMs.C +++ /dev/null @@ -1,38 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "makeCombustionTypes.H" - -#include "psiChemistryCombustion.H" -#include "rhoChemistryCombustion.H" -#include "EDM.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makeCombustionTypes(EDM, psiChemistryCombustion, psiCombustionModel); -makeCombustionTypes(EDM, rhoChemistryCombustion, rhoCombustionModel); - - -// ************************************************************************* // diff --git a/src/combustionModels/Make/files b/src/combustionModels/Make/files index 97a885f31..b68fbb742 100644 --- a/src/combustionModels/Make/files +++ b/src/combustionModels/Make/files @@ -13,8 +13,6 @@ rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C diffusion/diffusions.C infinitelyFastChemistry/infinitelyFastChemistrys.C -EDM/EDMs.C - PaSR/PaSRs.C laminar/laminars.C diff --git a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C index 4b163dcf8..be0ccfabf 100644 --- a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C +++ b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C @@ -47,12 +47,6 @@ Foam::combustionModels::psiChemistryCombustion::~psiChemistryCombustion() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::combustionModels::psiChemistryCombustion::chem() -{ - return chemistryPtr_; -} - Foam::psiReactionThermo& Foam::combustionModels::psiChemistryCombustion::thermo() { diff --git a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H index 548f4502d..e3725d35d 100644 --- a/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H +++ b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H @@ -90,8 +90,6 @@ public: // Member Functions - autoPtr chem(); - //- Return access to the thermo package virtual psiReactionThermo& thermo(); diff --git a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C index 38efabb7e..70ce698d7 100644 --- a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C +++ b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C @@ -46,11 +46,6 @@ Foam::combustionModels::rhoChemistryCombustion::~rhoChemistryCombustion() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::combustionModels::rhoChemistryCombustion::chem() -{ - return chemistryPtr_; -} Foam::rhoReactionThermo& Foam::combustionModels::rhoChemistryCombustion::thermo() diff --git a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H index e74fb5528..2a37812e0 100644 --- a/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H +++ b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H @@ -90,8 +90,6 @@ public: // Member Functions - autoPtr chem(); - //- Return access to the thermo package virtual rhoReactionThermo& thermo();