diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options index 4c9cff9d9583f857d344a58c88eb973002c9181f..cffe6f344a148d8b60b35ccb42990542b8c1cfcc 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options +++ b/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 diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H index a824308f1395614642e938b5002af69a5451d57b..c22eeb8cc35115631cb94959c73b68a83de323cc 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H +++ b/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); diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C index a92a4b3e5d9822726e4f6c240b264cabc35bbf2a..9ee1c4c5572f808b7a173a7b093cee0a12b7815f 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C +++ b/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" diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 6ae6ae3a914ad59663c13b8bc05ad9ec0362579c..d883b02f398eba97138b752952c0146f9c1bdc7f 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/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); diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 0ad5e425cd23a5bebdc5ad09c4fedd1125286f43..795aeda2cdef76f183e59a7ae53a07aa0f1d7008 100644 --- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/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);