From 67ee945ad35f0c665662d9c3d70adc746f13a1c6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 9 Jan 2009 16:26:55 +0000
Subject: [PATCH] updating to new turbulence framework and injection
specifications
---
.../rhoTurbTwinParcelFoam/Make/options | 5 +++--
.../rhoTurbTwinParcelFoam/createFields.H | 11 ++---------
.../rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C | 2 +-
.../constant/kinematicCloud1Properties | 12 ++++++------
.../simplifiedSiwek/constant/thermoCloud1Properties | 12 ++++++------
5 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
index 4c9cff9d958..cffe6f344a1 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 a824308f139..c22eeb8cc35 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 a92a4b3e5d9..9ee1c4c5572 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 6ae6ae3a914..d883b02f398 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 0ad5e425cd2..795aeda2cde 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);
--
GitLab