removed unecessary templates

src/thermophysicalModels/radiation/Make/files

@@ -31,8 +31,8 @@ submodels/sootModel/sootModel/sootModel.C
 submodels/sootModel/sootModel/sootModelNew.C
 submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C
 submodels/sootModel/noSoot/noSoot.C
-submodels/sootModel/khanGreeveSoot/khanGreeveSoots.C
+submodels/sootModel/khanGreeveSoot/khanGreeveSoot.C
-submodels/sootModel/MossBrookesSoot/MossBrookesSoots.C
+submodels/sootModel/MossBrookesSoot/MossBrookesSoot.C
 
 /* Boundary conditions */
 derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C

src/thermophysicalModels/radiation/submodels/sootModel/MossBrookesSoot/MossBrookesSoot.C

@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "MossBrookesSoot.H"
+#include "addToRunTimeSelectionTable.H"
 #include "fvm.H"
 #include "basicSpecieMixture.H"
 
@@ -31,9 +32,24 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 
-template<class CombThermoType, class ThermoType>
+namespace Foam
+{
+    namespace radiation
+    {
+        defineTypeNameAndDebug(MossBrookesSoot, 0);
+
+        addToRunTimeSelectionTable
+        (
+            sootModel,
+            MossBrookesSoot,
+            dictionary
+        );
+    }
+}
+
+
 const Foam::basicSpecieMixture&
-Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::checkThermo
+Foam::radiation::MossBrookesSoot::checkThermo
 (
     const fluidThermo& thermo
 )
@@ -63,8 +79,7 @@ Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::checkThermo
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
+Foam::radiation::MossBrookesSoot::MossBrookesSoot
-Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::MossBrookesSoot
 (
     const dictionary& dict,
     const fvMesh& mesh,
@@ -275,17 +290,15 @@ Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::MossBrookesSoot
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
+Foam::radiation::MossBrookesSoot::~MossBrookesSoot()
-Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::~MossBrookesSoot()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-template<class CombThermoType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::a(const label bandI) const
+Foam::radiation::MossBrookesSoot::a(const label bandI) const
 {
 
     const volScalarField T_ = thermo_.T();
@@ -325,16 +338,14 @@ Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::a(const label band
     return tas;
 }
 
-template<class CombThermoType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::e(const label bandI) const
+Foam::radiation::MossBrookesSoot::e(const label bandI) const
 {
 
     return a(bandI);
 }
 
-template<class CombThermoType, class ThermoType>
+void Foam::radiation::MossBrookesSoot::correct()
-void Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::correct()
 {
 
     calcSource();
@@ -400,8 +411,7 @@ void Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::correct()
 }
 
 
-template<class CombThermoType, class ThermoType>
+void Foam::radiation::MossBrookesSoot::calcSource()
-void Foam::radiation::MossBrookesSoot<CombThermoType, ThermoType>::calcSource()
 {
     const volScalarField rho_ = thermo_.rho();
     const volScalarField T_ = thermo_.T();

src/thermophysicalModels/radiation/submodels/sootModel/MossBrookesSoot/MossBrookesSoot.H

@@ -64,7 +64,6 @@ SourceFiles
 #ifndef MossBrookesSoot_H
 #define MossBrookesSoot_H
 
-#include "interpolationLookUpTable.H"
 #include "sootModel.H"
 #include "HashTable.H"
 
@@ -82,7 +81,6 @@ namespace radiation
 /*---------------------------------------------------------------------------*\
                     Class MossBrookesSoot Declaration
 \*---------------------------------------------------------------------------*/
-template<class CombThermoType, class ThermoType>
 class MossBrookesSoot
 :
     public sootModel
@@ -272,11 +270,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "MossBrookesSoot.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
 

src/thermophysicalModels/radiation/submodels/sootModel/MossBrookesSoot/MossBrookesSoots.C

@@ -1,45 +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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-
-#include "MossBrookesSoot.H"
-#include "makeSootTypes.H"
-#include "thermoPhysicsTypes.H"
-#include "psiChemistryModel.H"
-#include "rhoChemistryModel.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeSootTypesCombThermo(MossBrookesSoot, psiChemistryModel, gasHThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, psiChemistryModel, gasEThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, psiChemistryModel, gasHaThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, psiChemistryModel, gasEaThermoPhysics);
-
-makeSootTypesCombThermo(MossBrookesSoot, rhoChemistryModel, gasHThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, rhoChemistryModel, gasEThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, rhoChemistryModel, gasHaThermoPhysics);
-makeSootTypesCombThermo(MossBrookesSoot, rhoChemistryModel, gasEaThermoPhysics);
-
-// ************************************************************************* //

src/thermophysicalModels/radiation/submodels/sootModel/khanGreeveSoot/khanGreeveSoot.C

@@ -24,15 +24,31 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "khanGreeveSoot.H"
+#include "addToRunTimeSelectionTable.H"
 #include "fvm.H"
 #include "basicSpecieMixture.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 
-template<class CombThermoType, class ThermoType>
+namespace Foam
+{
+    namespace radiation
+    {
+        defineTypeNameAndDebug(khanGreeveSoot, 0);
+
+        addToRunTimeSelectionTable
+        (
+            sootModel,
+            khanGreeveSoot,
+            dictionary
+        );
+    }
+}
+
+
 const Foam::basicSpecieMixture&
-Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::checkThermo
+Foam::radiation::khanGreeveSoot::checkThermo
 (
     const fluidThermo& thermo
 )
@@ -62,8 +78,7 @@ Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::checkThermo
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
+Foam::radiation::khanGreeveSoot::khanGreeveSoot
-Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::khanGreeveSoot
 
 (
     const dictionary& dict,
@@ -194,8 +209,7 @@ Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::khanGreeveSoot
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
+Foam::radiation::khanGreeveSoot::~khanGreeveSoot()
-Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::~khanGreeveSoot()
 
 {}
 
@@ -203,9 +217,8 @@ Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::~khanGreeveSoot()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
-template<class CombThermoType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::a(const label bandI) const
+Foam::radiation::khanGreeveSoot::a(const label bandI) const
 {
 
     const volScalarField T_ = thermo_.T();
@@ -242,17 +255,15 @@ Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::a(const label bandI
 }
 
 
-template<class CombThermoType, class ThermoType>
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::e(const label bandI) const
+Foam::radiation::khanGreeveSoot::e(const label bandI) const
 {
 
     return a(bandI);
 }
 
 
-template<class CombThermoType, class ThermoType>
+void Foam::radiation::khanGreeveSoot::correct()
-void Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::correct()
 {
 
     calcSource();
@@ -289,8 +300,7 @@ void Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::correct()
 }
 
 
-template<class CombThermoType, class ThermoType>
+void Foam::radiation::khanGreeveSoot::calcSource()
-void Foam::radiation::khanGreeveSoot<CombThermoType, ThermoType>::calcSource()
 {
     const volScalarField rho_ = thermo_.rho();
     const volScalarField T_ = thermo_.T();

src/thermophysicalModels/radiation/submodels/sootModel/khanGreeveSoot/khanGreeveSoot.H

@@ -59,7 +59,6 @@ SourceFiles
 #ifndef khanGreeveSoot_H
 #define khanGreeveSoot_H
 
-#include "interpolationLookUpTable.H"
 #include "sootModel.H"
 #include "HashTable.H"
 
@@ -77,7 +76,6 @@ namespace radiation
 /*---------------------------------------------------------------------------*\
                     Class khanGreeveSoot Declaration
 \*---------------------------------------------------------------------------*/
-template<class CombThermoType, class ThermoType>
 class khanGreeveSoot
 :
     public sootModel
@@ -219,11 +217,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "khanGreeveSoot.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
 

src/thermophysicalModels/radiation/submodels/sootModel/khanGreeveSoot/khanGreeveSoots.C

@@ -1,48 +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 <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-
-#include "khanGreeveSoot.H"
-#include "makeSootTypes.H"
-#include "thermoPhysicsTypes.H"
-#include "psiChemistryModel.H"
-#include "rhoChemistryModel.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-makeSootTypesCombThermo(khanGreeveSoot, psiChemistryModel, gasHThermoPhysics);
-makeSootTypesCombThermo(khanGreeveSoot, psiChemistryModel, gasEThermoPhysics);
-
-makeSootTypesCombThermo(khanGreeveSoot, psiChemistryModel, gasHaThermoPhysics);
-makeSootTypesCombThermo(khanGreeveSoot, psiChemistryModel, gasEaThermoPhysics);
-
-makeSootTypesCombThermo(khanGreeveSoot, rhoChemistryModel, gasHThermoPhysics);
-makeSootTypesCombThermo(khanGreeveSoot, rhoChemistryModel, gasEThermoPhysics);
-
-makeSootTypesCombThermo(khanGreeveSoot, rhoChemistryModel, gasHaThermoPhysics);
-makeSootTypesCombThermo(khanGreeveSoot, rhoChemistryModel, gasEaThermoPhysics);
-
-// makeSootTypesThermo(mixtureFractionSoot, gasEThermoPhysics);
-// ************************************************************************* //