Removed second template parameter from YSLFM class

Althenor · Sep 23, 2015 · 9ebf773 · 9ebf773
1 parent dec81eb
commit 9ebf773
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 97 deletions.
diff --git a/src/combustionModels/YSLFModel/YSLFModel.C b/src/combustionModels/YSLFModel/YSLFModel.C
@@ -37,8 +37,8 @@ namespace combustionModels
 {
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
-YSLFModel<CombThermoType, ThermoType>::YSLFModel
+template<class CombThermoType>
+YSLFModel<CombThermoType>::YSLFModel
 (
     const word& modelType, const fvMesh& mesh
 )
@@ -71,23 +71,23 @@ YSLFModel<CombThermoType, ThermoType>::YSLFModel
 
 // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
-YSLFModel<CombThermoType, ThermoType>::~YSLFModel()
+template<class CombThermoType>
+YSLFModel<CombThermoType>::~YSLFModel()
 {}
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class CombThermoType, class ThermoType>
-hashedWordList YSLFModel<CombThermoType, ThermoType>::tables()
+template<class CombThermoType>
+hashedWordList YSLFModel<CombThermoType>::tables()
 {
 	hashedWordList tableNames = this->thermo().composition().species();
 	tableNames.append("he");
 
 	return tableNames;
 }
 
-template<class CombThermoType, class ThermoType>
-void YSLFModel<CombThermoType, ThermoType>::correct()
+template<class CombThermoType>
+void YSLFModel<CombThermoType>::correct()
 {
     // limit the scalar dissipation rate to avoid instabilities at extinction
     scalar chiLimiter = solver_.maxChi();
@@ -167,15 +167,15 @@ void YSLFModel<CombThermoType, ThermoType>::correct()
     }
 }
 
-template<class CombThermoType, class ThermoType>
-Switch YSLFModel<CombThermoType, ThermoType>::correctDensity()
+template<class CombThermoType>
+Switch YSLFModel<CombThermoType>::correctDensity()
 {
 	return true;
 }
 
-template<class CombThermoType, class ThermoType>
+template<class CombThermoType>
 Foam::tmp<Foam::fvScalarMatrix>
-YSLFModel<CombThermoType, ThermoType>::R
+YSLFModel<CombThermoType>::R
 (
     volScalarField& Y              
 ) const
@@ -184,9 +184,9 @@ YSLFModel<CombThermoType, ThermoType>::R
     return tSu;
 }
 
-template<class CombThermoType, class ThermoType>
+template<class CombThermoType>
 Foam::tmp<Foam::volScalarField>
-YSLFModel< CombThermoType, ThermoType>::Sh() const
+YSLFModel< CombThermoType>::Sh() const
 {
     tmp<volScalarField> tSh
     (
@@ -210,9 +210,9 @@ YSLFModel< CombThermoType, ThermoType>::Sh() const
     return tSh;
 }
 
-template<class CombThermoType, class ThermoType>
+template<class CombThermoType>
 Foam::tmp<Foam::volScalarField>
-YSLFModel< CombThermoType, ThermoType>::dQ() const
+YSLFModel< CombThermoType>::dQ() const
 {
     tmp<volScalarField> tdQ
     (
@@ -236,8 +236,8 @@ YSLFModel< CombThermoType, ThermoType>::dQ() const
     return tdQ;
 }
 
-template<class CombThermoType, class ThermoType>
-bool YSLFModel<CombThermoType, ThermoType>::read()
+template<class CombThermoType>
+bool YSLFModel<CombThermoType>::read()
 {
     if (CombThermoType::read())
     {

diff --git a/src/combustionModels/YSLFModel/YSLFModel.H b/src/combustionModels/YSLFModel/YSLFModel.H
@@ -62,7 +62,7 @@ namespace combustionModels
                   Class YSLFModel Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class CombThermoType, class ThermoType>
+template<class CombThermoType>
 class YSLFModel
 :
     public CombThermoType

diff --git a/src/combustionModels/YSLFModel/YSLFModels.C b/src/combustionModels/YSLFModel/YSLFModels.C
@@ -38,11 +38,10 @@ namespace Foam
 namespace combustionModels
 {
 
-makeCombustionTypesThermo
+makeCombustionTypes
 (
     YSLFModel,
     rhoThermoCombustion,
-    gasHThermoPhysics,  
     rhoCombustionModel  
 );
 

diff --git a/tutorial/pilotedDiffusionFlame/les/constant/combustionProperties b/tutorial/pilotedDiffusionFlame/les/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  YSLFModel<rhoThermoCombustion,gasHThermoPhysics>;
+combustionModel  YSLFModel<rhoThermoCombustion>;
 
 active  true;
 

diff --git a/tutorial/pilotedDiffusionFlame/ras/constant/combustionProperties b/tutorial/pilotedDiffusionFlame/ras/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  YSLFModel<rhoThermoCombustion,gasHThermoPhysics>;
+combustionModel  YSLFModel<rhoThermoCombustion>;
 
 active  true;
 

diff --git a/tutorial/pilotedDiffusionFlame/ras/constant/polyMesh/boundary b/tutorial/pilotedDiffusionFlame/ras/constant/polyMesh/boundary