updating to new turbulence framework and injection specifications

tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
 
 EXE_LIBS = \
     -llagrangian \
@@ -18,4 +18,5 @@ EXE_LIBS = \
     -lcombustionThermophysicalModels \
     -lspecie \
     -lradiation \
-    -lcompressibleRASModels
+    -lcompressibleRASModels \
+    -lcompressibleLESModels

tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H

@@ -41,18 +41,11 @@
 
 
     Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
+    autoPtr<compressible::turbulenceModel> turbulence
     (
-        compressible::RASModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo()
-        )
+        compressible::turbulenceModel::New(rho, U, phi, thermo())
     );
 
-
     Info<< "Creating field DpDt\n" << endl;
     volScalarField DpDt =
         fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C

@@ -32,7 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
+#include "turbulenceModel.H"
 
 #include "basicThermoCloud.H"
 #include "basicKinematicCloud.H"

tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties

@@ -20,12 +20,6 @@ DragModel                                SphereDrag;
 DispersionModel                          StochasticDispersionRAS;
 WallInteractionModel                     StandardWallInteraction;
 
-// Parcel basis type
-parcelBasisType                          mass;
-
-// Total mass to inject
-massTotal  massTotal [ 1  0  0  0  0]    2.0e-4;
-
 // Minimum particle mass
 minParticleMass      minParticleMass     [ 1  0  0  0  0]     1.0e-15;
 
@@ -52,6 +46,12 @@ integrationSchemes
 
 ManualInjectionCoeffs
 {
+    // Parcel basis type
+    parcelBasisType                          mass;
+
+    // Total mass to inject
+    massTotal  massTotal [ 1  0  0  0  0]    2.0e-4;
+
     SOI                                  0.0;
     positionsFile                        kinematicCloud1Positions;
     U0                                   (0 0 0);

tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties

@@ -23,12 +23,6 @@ HeatTransferModel                        RanzMarshall;
 
 radiation                                off;
 
-// Parcel basis type
-parcelBasisType                          mass;
-
-// Total mass to inject
-massTotal  massTotal [ 1  0  0  0  0]    1e-4;
-
 // Minimum particle mass
 minParticleMass      minParticleMass     [ 1  0  0  0  0]     1.0e-15;
 
@@ -62,6 +56,12 @@ integrationSchemes
 
 ManualInjectionCoeffs
 {
+    // Total mass to inject
+    massTotal  massTotal [ 1  0  0  0  0]    1e-4;
+
+    // Parcel basis type
+    parcelBasisType                          mass;
+
     SOI                                  0.0;
     positionsFile                        thermoCloud1Positions;
     U0                                   (0 0 0);