Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

applications/solvers/combustion/fireFoam/Make/options

@@ -49,7 +49,9 @@ EXE_LIBS = \
     -lregionModels \
     -lradiationModels \
     -lsurfaceFilmModels \
+    -lsurfaceFilmDerivedFvPatchFields \
     -lpyrolysisModels \
     -lregionCoupling \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lODE

applications/solvers/lagrangian/DPMFoam/Make/options

@@ -14,7 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \

applications/solvers/lagrangian/coalChemistryFoam/Make/options

@@ -35,6 +35,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lcoalCombustion\
     -lspecie \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options

@@ -16,6 +16,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options

@@ -20,6 +20,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \

applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options

@@ -43,6 +43,8 @@ EXE_LIBS = \
     -lregionModels \
     -lradiationModels \
     -lsurfaceFilmModels \
+    -lsurfaceFilmDerivedFvPatchFields \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lODE \
     -lcombustionModels

applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options

@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \

applications/solvers/lagrangian/reactingParcelFoam/Make/options

@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options

@@ -34,6 +34,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lspecie \
     -lfluidThermophysicalModels \
     -lliquidProperties \

applications/solvers/lagrangian/sprayFoam/Make/options

@@ -35,6 +35,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -llagrangianSpray \
     -lspecie \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options

@@ -37,6 +37,7 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -llagrangianSpray \
     -lspecie \
     -lfluidThermophysicalModels \

applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options

@@ -14,6 +14,7 @@ EXE_INC = \
 EXE_LIBS = \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -lthermophysicalFunctions \
     -lfluidThermophysicalModels \
     -lspecie \

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H

@@ -32,6 +32,9 @@
         )/(mesh.magSf().boundaryField()*rAUf.boundaryField())
     );
 
+    // Make the fluxes relative to the mesh motion
+    fvc::makeRelative(phiHbyA, U);
+
     tmp<fvScalarMatrix> p_rghEqnComp1;
     tmp<fvScalarMatrix> p_rghEqnComp2;
 
@@ -114,12 +117,9 @@
     {
         Uf = fvc::interpolate(U);
         surfaceVectorField n(mesh.Sf()/mesh.magSf());
-        Uf += n*(phi/mesh.magSf() - (n & Uf));
+        Uf += n*(fvc::absolute(phi, U)/mesh.magSf() - (n & Uf));
     }
 
-    // Make the fluxes relative to the mesh motion
-    fvc::makeRelative(phi, U);
-
     // Update densities from change in p_rgh
     rho1 += psi1*(p_rgh - p_rgh_0);
     rho2 += psi2*(p_rgh - p_rgh_0);

src/lagrangian/Allwmake

@@ -7,6 +7,7 @@ wmake $makeType distributionModels
 wmake $makeType basic
 wmake $makeType solidParticle
 wmake $makeType intermediate
+wmake $makeType turbulence
 wmake $makeType spray
 wmake $makeType dsmc
 wmake $makeType coalCombustion

src/lagrangian/coalCombustion/Make/options

@@ -24,6 +24,7 @@ LIB_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -ldistributionModels \
     -lspecie \
     -lfluidThermophysicalModels \

src/lagrangian/intermediate/Make/options

@@ -12,7 +12,6 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -33,13 +32,6 @@ LIB_LIBS = \
     -lreactionThermophysicalModels \
     -lSLGThermo \
     -lradiationModels \
-    -lincompressibleTurbulenceModel \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lcompressibleTurbulenceModel \
-    -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lLESdeltas \
     -lincompressibleTransportModels \
     -lregionModels \
     -lsurfaceFilmModels \

src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H

@@ -29,25 +29,13 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "NoDispersion.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define makeParcelDispersionModels(CloudType)                                 \
                                                                               \
     makeDispersionModel(CloudType);                                           \
-                                                                              \
-    typedef CloudType::kinematicCloudType kinematicCloudType;                 \
-    defineNamedTemplateTypeNameAndDebug                                       \
-    (                                                                         \
-        DispersionRASModel<kinematicCloudType>,                               \
-        0                                                                     \
-    );                                                                        \
-                                                                              \
-    makeDispersionModelType(NoDispersion, CloudType);                         \
-    makeDispersionModelType(GradientDispersionRAS, CloudType);                \
-    makeDispersionModelType(StochasticDispersionRAS, CloudType);
+    makeDispersionModelType(NoDispersion, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H

@@ -34,7 +34,6 @@ License
 #include "SaffmanMeiLiftForce.H"
 #include "TomiyamaLiftForce.H"
 
-#include "BrownianMotionForce.H"
 #include "GravityForce.H"
 #include "NonInertialFrameForce.H"
 #include "ParamagneticForce.H"
@@ -51,7 +50,6 @@ License
     makeParticleForceModelType(NonSphereDragForce, CloudType);                \
     makeParticleForceModelType(SaffmanMeiLiftForce, CloudType);               \
     makeParticleForceModelType(TomiyamaLiftForce, CloudType);                 \
-    makeParticleForceModelType(BrownianMotionForce, CloudType);               \
     makeParticleForceModelType(GravityForce, CloudType);                      \
     makeParticleForceModelType(NonInertialFrameForce, CloudType);             \
     makeParticleForceModelType(ParamagneticForce, CloudType);                 \

src/lagrangian/spray/Make/options

@@ -25,6 +25,7 @@ LIB_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -ldistributionModels \
     -lspecie \
     -lfluidThermophysicalModels \

src/lagrangian/turbulence/Make/files

+PARCELS=parcels
+DERIVEDPARCELS=$(PARCELS)/derived
+
+KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
+$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
+
+KINEMATICCOLLIDINGPARCEL=$(DERIVEDPARCELS)/basicKinematicCollidingParcel
+$(KINEMATICCOLLIDINGPARCEL)/makeBasicKinematicCollidingParcelSubmodels.C
+
+THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
+$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C
+
+REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
+$(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C
+
+REACTINGMPPARCEL=$(DERIVEDPARCELS)/basicReactingMultiphaseParcel
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelSubmodels.C
+
+LIB = $(FOAM_LIBBIN)/liblagrangianTurbulence