diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options index d1deb55a..ea1cc90a 100644 --- a/src/lagrangian/spray/Make/options +++ b/src/lagrangian/spray/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/lagrangian/turbulence/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ diff --git a/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C b/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C index 3af2751d..3f92b79a 100644 --- a/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C +++ b/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,9 @@ License // Kinematic #include "makeThermoParcelForces.H" // thermo variant +#include "makeThermoParcelTurbulenceForces.H" // add turbulence variant #include "makeParcelDispersionModels.H" +#include "makeParcelTurbulenceDispersionModels.H" // add turbulence variant #include "makeSprayParcelInjectionModels.H" // Spray variant #include "makeParcelPatchInteractionModels.H" #include "makeSprayParcelStochasticCollisionModels.H" // Spray variant @@ -54,7 +56,9 @@ namespace Foam // Kinematic sub-models makeThermoParcelForces(basicSprayCloud); + makeThermoParcelTurbulenceForces(basicSprayCloud); makeParcelDispersionModels(basicSprayCloud); + makeParcelTurbulenceDispersionModels(basicSprayCloud); makeSprayParcelInjectionModels(basicSprayCloud); makeParcelPatchInteractionModels(basicSprayCloud); makeSprayParcelStochasticCollisionModels(basicSprayCloud); diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C index 584dc186..cf78c33c 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C @@ -24,33 +24,13 @@ License \*---------------------------------------------------------------------------*/ #include "basicKinematicCollidingCloud.H" - -#include "makeParcelCloudFunctionObjects.H" - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" +#include "makeParcelTurbulenceDispersionModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef basicKinematicCollidingCloud::kinematicCloudType - kinematicCloudType_K; - defineNamedTemplateTypeNameAndDebug - ( - DispersionRASModel, - 0 - ); - makeDispersionModelType - ( - GradientDispersionRAS, - basicKinematicCollidingCloud - ); - makeDispersionModelType - ( - StochasticDispersionRAS, - basicKinematicCollidingCloud - ); + makeParcelTurbulenceDispersionModels(basicKinematicCollidingCloud); } diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C index 119de86c..4d7c1e90 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,24 +24,13 @@ License \*---------------------------------------------------------------------------*/ #include "basicKinematicCloud.H" - -#include "makeParcelCloudFunctionObjects.H" - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" +#include "makeParcelTurbulenceDispersionModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef basicKinematicCloud::kinematicCloudType kinematicCloudType_K; - defineNamedTemplateTypeNameAndDebug - ( - DispersionRASModel, - 0 - ); - makeDispersionModelType(GradientDispersionRAS, basicKinematicCloud); - makeDispersionModelType(StochasticDispersionRAS, basicKinematicCloud); + makeParcelTurbulenceDispersionModels(basicKinematicCloud); } diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C index 08720bbc..341bf7f3 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,40 +25,15 @@ License #include "basicReactingMultiphaseCloud.H" -#include "makeParcelCloudFunctionObjects.H" - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" - -#include "BrownianMotionForce.H" +#include "makeParcelTurbulenceDispersionModels.H" +#include "makeThermoParcelTurbulenceForces.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef basicReactingMultiphaseCloud::kinematicCloudType - kinematicCloudType_K; - defineNamedTemplateTypeNameAndDebug - ( - DispersionRASModel, - 0 - ); - makeDispersionModelType - ( - GradientDispersionRAS, - basicReactingMultiphaseCloud - ); - makeDispersionModelType - ( - StochasticDispersionRAS, - basicReactingMultiphaseCloud - ); - - makeParticleForceModelType - ( - BrownianMotionForce, - basicReactingMultiphaseCloud - ); + makeThermoParcelTurbulenceForces(basicReactingMultiphaseCloud); + makeParcelTurbulenceDispersionModels(basicReactingMultiphaseCloud); } diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C index da13ed2e..c259d405 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,27 +25,15 @@ License #include "basicReactingCloud.H" -#include "makeParcelCloudFunctionObjects.H" - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" - -#include "BrownianMotionForce.H" +#include "makeParcelTurbulenceDispersionModels.H" +#include "makeThermoParcelTurbulenceForces.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef basicReactingCloud::kinematicCloudType kinematicCloudType_K; - defineNamedTemplateTypeNameAndDebug - ( - DispersionRASModel, - 0 - ); - makeDispersionModelType(GradientDispersionRAS, basicReactingCloud); - makeDispersionModelType(StochasticDispersionRAS, basicReactingCloud); - - makeParticleForceModelType(BrownianMotionForce, basicReactingCloud); + makeThermoParcelTurbulenceForces(basicReactingCloud); + makeParcelTurbulenceDispersionModels(basicReactingCloud); } diff --git a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C index 5c71da29..d5c398dd 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,27 +25,15 @@ License #include "basicThermoCloud.H" -#include "makeParcelCloudFunctionObjects.H" - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" - -#include "BrownianMotionForce.H" +#include "makeParcelTurbulenceDispersionModels.H" +#include "makeThermoParcelTurbulenceForces.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef basicThermoCloud::kinematicCloudType kinematicCloudType_K; - defineNamedTemplateTypeNameAndDebug - ( - DispersionRASModel, - 0 - ); - makeDispersionModelType(GradientDispersionRAS, basicThermoCloud); - makeDispersionModelType(StochasticDispersionRAS, basicThermoCloud); - - makeParticleForceModelType(BrownianMotionForce, basicThermoCloud); + makeThermoParcelTurbulenceForces(basicThermoCloud); + makeParcelTurbulenceDispersionModels(basicThermoCloud); } diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H similarity index 90% rename from src/lagrangian/turbulence/parcels/include/makeParcelDispersionModels.H rename to src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H index be281ecb..d2428ba4 100644 --- a/src/lagrangian/turbulence/parcels/include/makeParcelDispersionModels.H +++ b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#ifndef makeParcelDispersionModels_h -#define makeParcelDispersionModels_h +#ifndef makeParcelTurbulenceDispersionModels_h +#define makeParcelTurbulenceDispersionModels_h // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeParcelDispersionModels(CloudType) \ +#define makeParcelTurbulenceDispersionModels(CloudType) \ \ typedef CloudType::kinematicCloudType kinematicCloudType; \ defineNamedTemplateTypeNameAndDebug \ diff --git a/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H new file mode 100644 index 00000000..d7581110 --- /dev/null +++ b/src/lagrangian/turbulence/parcels/include/makeThermoParcelTurbulenceForces.H @@ -0,0 +1,44 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#ifndef makeThermoParcelTurbulenceForces_h +#define makeThermoParcelTurbulenceForces_h + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "BrownianMotionForce.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#define makeThermoParcelTurbulenceForces(CloudType) \ + \ + makeParticleForceModelType(BrownianMotionForce, CloudType); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C index c96a5c5b..06fa810a 100644 --- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C +++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ License #include "GradientDispersionRAS.H" #include "demandDrivenData.H" +#include "fvcGrad.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //