Merge pull request #1 from mrklein/master

Fix for duplicate entries

.gitignore

@@ -0,0 +1,2 @@
+**/Make/linux*
+lnInclude

kOmegaSSTSASnew/compressible/Make/files

@@ -1,2 +1,3 @@
-myturbulentFluidThermoModels.C
+makeTurbulenceModels.C
+
 LIB = $(FOAM_USER_LIBBIN)/libmycompressibleturbulenceModels

kOmegaSSTSASnew/compressible/Make/options

@@ -1,6 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \

kOmegaSSTSASnew/compressible/kOmegaSSTSASnew.C

@@ -23,6 +23,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "makeTurbulenceModel.H"
+
 #include "kOmegaSSTSASnew.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

kOmegaSSTSASnew/compressible/makeTurbulenceModels.C

@@ -0,0 +1,23 @@
+#include "turbulentFluidThermoModel.H"
+#include "addToRunTimeSelectionTable.H"
+#include "makeTurbulenceModel.H"
+
+namespace Foam
+{
+
+typedef ThermalDiffusivity<CompressibleTurbulenceModel<fluidThermo> >
+    fluidThermoCompressibleTurbulenceModel;
+
+typedef RASModel<EddyDiffusivity<fluidThermoCompressibleTurbulenceModel> >
+    RASfluidThermoCompressibleTurbulenceModel;
+
+}
+
+
+#include "kOmegaSSTSASnew.H"
+makeTemplatedTurbulenceModel
+(
+    fluidThermoCompressibleTurbulenceModel,
+    RAS,
+    kOmegaSSTSASnew
+);

kOmegaSSTSASnew/incompressible/Make/files

@@ -1,2 +1,3 @@
-myturbulentTransportModels.C
+makeTurbulenceModels.C
+
 LIB = $(FOAM_USER_LIBBIN)/libmyincompressibleturbulenceModels

kOmegaSSTSASnew/incompressible/kOmegaSSTSASnew.C

@@ -25,6 +25,8 @@ License
 
 #include "kOmegaSSTSASnew.H"
 
+#include "turbulentTransportModel.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

kOmegaSSTSASnew/incompressible/kOmegaSSTSASnew.H

@@ -94,7 +94,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class kOmegaSSTSAS Declaration
+                       Class kOmegaSSTSASnew Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class BasicTurbulenceModel>
@@ -137,12 +137,12 @@ protected:
         ) const;
 
 
-public:
 
     typedef typename BasicTurbulenceModel::alphaField alphaField;
     typedef typename BasicTurbulenceModel::rhoField rhoField;
     typedef typename BasicTurbulenceModel::transportModel transportModel;
 
+public:
 
     //- Runtime type information
     TypeName("kOmegaSSTSASnew");

kOmegaSSTSASnew/incompressible/makeTurbulenceModels.C

@@ -0,0 +1,22 @@
+#include "IncompressibleTurbulenceModel.H"
+#include "incompressible/transportModel/transportModel.H"
+#include "addToRunTimeSelectionTable.H"
+#include "makeTurbulenceModel.H"
+
+#include "RASModel.H"
+
+namespace Foam
+{
+    typedef IncompressibleTurbulenceModel<transportModel> 
+        transportModelIncompressibleTurbulenceModel;
+    typedef RASModel<transportModelIncompressibleTurbulenceModel>
+        RAStransportModelIncompressibleTurbulenceModel;
+}
+
+#include "kOmegaSSTSASnew.H"
+makeTemplatedTurbulenceModel
+(
+    transportModelIncompressibleTurbulenceModel,
+    RAS,
+    kOmegaSSTSASnew
+);