Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
94c54c1c
Commit
94c54c1c
authored
Feb 25, 2011
by
andy
Browse files
ENH: Updated lagrangian intermediate template instantiation macros
parent
34888963
Changes
23
Hide whitespace changes
Inline
Side-by-side
src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
View file @
94c54c1c
...
...
@@ -26,13 +26,13 @@ License
#include
"basicKinematicCollidingCloud.H"
// Kinematic
#include
"makeParcelForces
New
.H"
#include
"makeParcelDispersionModels
New
.H"
#include
"makeParcelInjectionModels
New
.H"
#include
"makeParcelForces.H"
#include
"makeParcelDispersionModels.H"
#include
"makeParcelInjectionModels.H"
#include
"makeParcelCollisionModels.H"
#include
"makeParcelPatchInteractionModels
New
.H"
#include
"makeParcelPostProcessingModels
New
.H"
#include
"makeParcelSurfaceFilmModels
New
.H"
#include
"makeParcelPatchInteractionModels.H"
#include
"makeParcelPostProcessingModels.H"
#include
"makeParcelSurfaceFilmModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
@@ -40,15 +40,15 @@ namespace Foam
{
// Kinematic sub-models
typedef
basicKinematicCollidingCloud
::
cloudType
basicKinematicCollidingCloud_
1
;
basicKinematicCollidingCloud_
K
;
makeParcelForces
New
(
basicKinematicCollidingCloud_
1
);
makeParcelDispersionModels
New
(
basicKinematicCollidingCloud_
1
);
makeParcelInjectionModels
New
(
basicKinematicCollidingCloud_
1
);
makeParcelForces
(
basicKinematicCollidingCloud_
K
);
makeParcelDispersionModels
(
basicKinematicCollidingCloud_
K
);
makeParcelInjectionModels
(
basicKinematicCollidingCloud_
K
);
makeParcelCollisionModels
(
basicKinematicCollidingCloud
);
makeParcelPatchInteractionModels
New
(
basicKinematicCollidingCloud_
1
);
makeParcelPostProcessingModels
New
(
basicKinematicCollidingCloud_
1
);
makeParcelSurfaceFilmModels
New
(
basicKinematicCollidingCloud_
1
);
makeParcelPatchInteractionModels
(
basicKinematicCollidingCloud_
K
);
makeParcelPostProcessingModels
(
basicKinematicCollidingCloud_
K
);
makeParcelSurfaceFilmModels
(
basicKinematicCollidingCloud_
K
);
}
...
...
src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
View file @
94c54c1c
...
...
@@ -23,29 +23,27 @@ License
\*---------------------------------------------------------------------------*/
#include
"basicKinematic
Parcel
.H"
#include
"basicKinematic
Cloud
.H"
// Kinematic
#include
"makeParcelForces.H"
#include
"makeParcelDispersionModels.H"
#include
"makeParcelInjectionModels.H"
#include
"makeParcelCollisionModels.H"
#include
"makeParcelPatchInteractionModels.H"
#include
"makeParcelPostProcessingModels.H"
#include
"makeParcelSurfaceFilmModels.H"
#include
"makeParcelForcesNew.H"
#include
"makeParcelDispersionModelsNew.H"
#include
"makeParcelInjectionModelsNew.H"
#include
"makeParcelPatchInteractionModelsNew.H"
#include
"makeParcelPostProcessingModelsNew.H"
#include
"makeParcelSurfaceFilmModelsNew.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
// Kinematic sub-models
makeParcelForces
(
basicKinematicParcel
);
makeParcelDispersionModels
(
basicKinematicParcel
);
makeParcelInjectionModels
(
basicKinematicParcel
);
makeParcelCollisionModels
(
basicKinematicParcel
);
makeParcelPatchInteractionModels
(
basicKinematicParcel
);
makeParcelPostProcessingModels
(
basicKinematicParcel
);
makeParcelSurfaceFilmModels
(
basicKinematicParcel
);
makeParcelForcesNew
(
basicKinematicCloud
);
makeParcelDispersionModelsNew
(
basicKinematicCloud
);
makeParcelInjectionModelsNew
(
basicKinematicCloud
);
makeParcelPatchInteractionModelsNew
(
basicKinematicCloud
);
makeParcelPostProcessingModelsNew
(
basicKinematicCloud
);
makeParcelSurfaceFilmModelsNew
(
basicKinematicCloud
);
}
...
...
src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
View file @
94c54c1c
...
...
@@ -23,13 +23,12 @@ License
\*---------------------------------------------------------------------------*/
#include
"basicReactingMultiphase
Parcel
.H"
#include
"basicReactingMultiphase
Cloud
.H"
// Kinematic
#include
"makeThermoParcelForces.H"
// thermo variant
#include
"makeParcelDispersionModels.H"
#include
"makeReactingMultiphaseParcelInjectionModels.H"
// MP variant
#include
"makeParcelCollisionModels.H"
#include
"makeParcelPatchInteractionModels.H"
#include
"makeParcelPostProcessingModels.H"
...
...
@@ -49,36 +48,42 @@ License
namespace
Foam
{
typedef
basicReactingMultiphaseCloud
::
cloudType
basicReactingMultiphaseCloud_R
;
typedef
basicReactingMultiphaseCloud_R
::
cloudType
basicReactingMultiphaseCloud_T
;
typedef
basicReactingMultiphaseCloud_T
::
cloudType
basicReactingMultiphaseCloud_K
;
// Kinematic sub-models
makeThermoParcelForces
(
basicReactingMultiphaseParcel
);
makeParcelDispersionModels
(
basicReactingMultiphaseParcel
);
makeReactingMultiphaseParcelInjectionModels
(
basicReactingMultiphaseParcel
);
makeParcelCollisionModels
(
basicReactingMultiphaseParcel
);
makeParcelPatchInteractionModels
(
basicReactingMultiphaseParcel
);
makeParcelPostProcessingModels
(
basicReactingMultiphaseParcel
);
makeThermoParcelForces
(
basicReactingMultiphaseCloud_K
);
makeParcelDispersionModels
(
basicReactingMultiphaseCloud_K
);
makeReactingMultiphaseParcelInjectionModels
(
basicReactingMultiphaseCloud_K
);
makeParcelPatchInteractionModels
(
basicReactingMultiphaseCloud_K
);
makeParcelPostProcessingModels
(
basicReactingMultiphaseCloud_K
);
// Thermo sub-models
makeParcelHeatTransferModels
(
basicReactingMultiphase
Parcel
);
makeParcelHeatTransferModels
(
basicReactingMultiphase
Cloud_T
);
// Reacting sub-models
makeReactingMultiphaseParcelCompositionModels
(
basicReactingMultiphase
Parcel
basicReactingMultiphase
Cloud_R
);
makeReactingParcelPhaseChangeModels
(
basicReactingMultiphase
Parcel
);
makeReactingParcelPhaseChangeModels
(
basicReactingMultiphase
Cloud_R
);
// Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels
(
basicReactingMultiphase
Parcel
basicReactingMultiphase
Cloud
);
makeReactingParcelSurfaceFilmModels
(
basicReactingMultiphase
Parcel
basicReactingMultiphase
Cloud_K
);
makeReactingMultiphaseParcelSurfaceReactionModels
(
basicReactingMultiphase
Parcel
basicReactingMultiphase
Cloud
);
}
...
...
src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
View file @
94c54c1c
...
...
@@ -23,13 +23,12 @@ License
\*---------------------------------------------------------------------------*/
#include
"basicReacting
Parcel
.H"
#include
"basicReacting
Cloud
.H"
// Kinematic
#include
"makeThermoParcelForces.H"
// thermo variant
#include
"makeParcelDispersionModels.H"
#include
"makeReactingParcelInjectionModels.H"
// Reacting variant
#include
"makeParcelCollisionModels.H"
#include
"makeParcelPatchInteractionModels.H"
#include
"makeParcelPostProcessingModels.H"
...
...
@@ -45,21 +44,23 @@ License
namespace
Foam
{
typedef
basicReactingCloud
::
cloudType
basicReactingCloud_T
;
typedef
basicReactingCloud_T
::
cloudType
basicReactingCloud_K
;
// Kinematic sub-models
makeThermoParcelForces
(
basicReactingParcel
);
makeParcelDispersionModels
(
basicReactingParcel
);
makeReactingParcelInjectionModels
(
basicReactingParcel
);
makeParcelCollisionModels
(
basicReactingParcel
);
makeParcelPatchInteractionModels
(
basicReactingParcel
);
makeParcelPostProcessingModels
(
basicReactingParcel
);
makeThermoParcelForces
(
basicReactingCloud_K
);
makeParcelDispersionModels
(
basicReactingCloud_K
);
makeReactingParcelInjectionModels
(
basicReactingCloud_K
);
makeParcelPatchInteractionModels
(
basicReactingCloud_K
);
makeParcelPostProcessingModels
(
basicReactingCloud_K
);
// Thermo sub-models
makeParcelHeatTransferModels
(
basicReacting
Parcel
);
makeParcelHeatTransferModels
(
basicReacting
Cloud_T
);
// Reacting sub-models
makeReactingParcelCompositionModels
(
basicReacting
Parcel
);
makeReactingParcelPhaseChangeModels
(
basicReacting
Parcel
);
makeReactingParcelSurfaceFilmModels
(
basicReacting
Parcel
);
makeReactingParcelCompositionModels
(
basicReacting
Cloud
);
makeReactingParcelPhaseChangeModels
(
basicReacting
Cloud
);
makeReactingParcelSurfaceFilmModels
(
basicReacting
Cloud_K
);
}
...
...
src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
View file @
94c54c1c
...
...
@@ -23,13 +23,12 @@ License
\*---------------------------------------------------------------------------*/
#include
"basicThermo
Parcel
.H"
#include
"basicThermo
Cloud
.H"
// Kinematic
#include
"makeThermoParcelForces.H"
// thermo variant
#include
"makeParcelDispersionModels.H"
#include
"makeParcelInjectionModels.H"
#include
"makeParcelCollisionModels.H"
#include
"makeParcelPatchInteractionModels.H"
#include
"makeParcelPostProcessingModels.H"
...
...
@@ -42,16 +41,18 @@ License
namespace
Foam
{
// Kinematic sub-models
makeThermoParcelForces
(
basicThermoParcel
);
makeParcelDispersionModels
(
basicThermoParcel
);
makeParcelInjectionModels
(
basicThermoParcel
);
makeParcelCollisionModels
(
basicThermoParcel
);
makeParcelPatchInteractionModels
(
basicThermoParcel
);
makeParcelPostProcessingModels
(
basicThermoParcel
);
typedef
basicThermoCloud
::
cloudType
basicThermoCloud_K
;
// Kinematic sub-models
makeThermoParcelForces
(
basicThermoCloud_K
);
makeParcelDispersionModels
(
basicThermoCloud_K
);
makeParcelInjectionModels
(
basicThermoCloud_K
);
makeParcelPatchInteractionModels
(
basicThermoCloud_K
);
makeParcelPostProcessingModels
(
basicThermoCloud_K
);
// Thermo sub-models
makeParcelHeatTransferModels
(
basicThermo
Parcel
);
makeParcelSurfaceFilmModels
(
basicThermo
Parcel
);
makeParcelHeatTransferModels
(
basicThermo
Cloud
);
makeParcelSurfaceFilmModels
(
basicThermo
Cloud_K
);
}
...
...
src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
View file @
94c54c1c
...
...
@@ -28,9 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"NoCollision.H"
#include
"PairCollision.H"
...
...
@@ -41,20 +38,18 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelCollisionModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelCollisionModels(CloudType) \
\
makeCollisionModel(
KC##Parcel
Type); \
makeCollisionModelType(NoCollision,
KC##Parcel
Type); \
makeCollisionModelType(PairCollision,
KC##Parcel
Type); \
makeCollisionModel(
Cloud
Type);
\
makeCollisionModelType(NoCollision,
Cloud
Type);
\
makeCollisionModelType(PairCollision,
Cloud
Type);
\
\
makePairModel(
KC##Parcel
Type); \
makePairModelType(PairSpringSliderDashpot,
KC##Parcel
Type); \
makePairModel(
Cloud
Type);
\
makePairModelType(PairSpringSliderDashpot,
Cloud
Type);
\
\
makeWallModel(
KC##Parcel
Type); \
makeWallModelType(WallSpringSliderDashpot,
KC##Parcel
Type); \
makeWallModelType(WallLocalSpringSliderDashpot,
KC##Parcel
Type);
makeWallModel(
Cloud
Type);
\
makeWallModelType(WallSpringSliderDashpot,
Cloud
Type);
\
makeWallModelType(WallLocalSpringSliderDashpot,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
View file @
94c54c1c
...
...
@@ -28,30 +28,21 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"NoDispersion.H"
#include
"GradientDispersionRAS.H"
#include
"StochasticDispersionRAS.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelDispersionModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelDispersionModels(CloudType) \
\
makeDispersionModel(
KC##Parcel
Type); \
makeDispersionModel(
Cloud
Type);
\
\
defineNamedTemplateTypeNameAndDebug \
( \
DispersionRASModel<KC##ParcelType>, \
0 \
); \
defineNamedTemplateTypeNameAndDebug(DispersionRASModel<CloudType>, 0); \
\
makeDispersionModelType(NoDispersion,
KC##Parcel
Type); \
makeDispersionModelType(GradientDispersionRAS,
KC##Parcel
Type); \
makeDispersionModelType(StochasticDispersionRAS,
KC##Parcel
Type);
makeDispersionModelType(NoDispersion,
Cloud
Type);
\
makeDispersionModelType(GradientDispersionRAS,
Cloud
Type);
\
makeDispersionModelType(StochasticDispersionRAS,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelForces.H
View file @
94c54c1c
...
...
@@ -28,9 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"SphereDragForce.H"
#include
"NonSphereDragForce.H"
...
...
@@ -41,17 +38,15 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelForces(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelForces(CloudType) \
\
makeParticleForceModel(
KC##Parcel
Type); \
makeParticleForceModelType(SphereDragForce,
KC##Parcel
Type); \
makeParticleForceModelType(NonSphereDragForce,
KC##Parcel
Type); \
makeParticleForceModelType(GravityForce,
KC##Parcel
Type); \
makeParticleForceModelType(ParamagneticForce,
KC##Parcel
Type); \
makeParticleForceModelType(PressureGradientForce,
KC##Parcel
Type); \
makeParticleForceModelType(SRFForce,
KC##Parcel
Type);
makeParticleForceModel(
Cloud
Type);
\
makeParticleForceModelType(SphereDragForce,
Cloud
Type);
\
makeParticleForceModelType(NonSphereDragForce,
Cloud
Type);
\
makeParticleForceModelType(GravityForce,
Cloud
Type);
\
makeParticleForceModelType(ParamagneticForce,
Cloud
Type);
\
makeParticleForceModelType(PressureGradientForce,
Cloud
Type);
\
makeParticleForceModelType(SRFForce,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
View file @
94c54c1c
...
...
@@ -28,23 +28,17 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"ThermoCloud.H"
#include
"NoHeatTransfer.H"
#include
"RanzMarshall.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelHeatTransferModels(ParcelType) \
\
typedef ThermoCloud<KinematicCloud<Cloud<ParcelType> > > TKC##ParcelType; \
#define makeParcelHeatTransferModels(CloudType) \
\
makeHeatTransferModel(
TKC##ParcelType);
\
makeHeatTransferModel(
CloudType);
\
\
makeHeatTransferModelType(NoHeatTransfer,
TKC##ParcelType);
\
makeHeatTransferModelType(RanzMarshall,
TKC##Parcel
Type);
makeHeatTransferModelType(NoHeatTransfer,
CloudType);
\
makeHeatTransferModelType(RanzMarshall,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
View file @
94c54c1c
...
...
@@ -28,9 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"ConeInjection.H"
#include
"FieldActivatedInjection.H"
#include
"InflationInjection.H"
...
...
@@ -42,19 +39,17 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelInjectionModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelInjectionModels(CloudType) \
\
makeInjectionModel(
KC##Parcel
Type); \
makeInjectionModel(
Cloud
Type);
\
\
makeInjectionModelType(ConeInjection,
KC##Parcel
Type); \
makeInjectionModelType(FieldActivatedInjection,
KC##Parcel
Type); \
makeInjectionModelType(InflationInjection,
KC##Parcel
Type); \
makeInjectionModelType(KinematicLookupTableInjection,
KC##Parcel
Type); \
makeInjectionModelType(ManualInjection,
KC##Parcel
Type); \
makeInjectionModelType(NoInjection,
KC##Parcel
Type); \
makeInjectionModelType(PatchInjection,
KC##Parcel
Type);
makeInjectionModelType(ConeInjection,
Cloud
Type);
\
makeInjectionModelType(FieldActivatedInjection,
Cloud
Type);
\
makeInjectionModelType(InflationInjection,
Cloud
Type);
\
makeInjectionModelType(KinematicLookupTableInjection,
Cloud
Type);
\
makeInjectionModelType(ManualInjection,
Cloud
Type);
\
makeInjectionModelType(NoInjection,
Cloud
Type);
\
makeInjectionModelType(PatchInjection,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
View file @
94c54c1c
...
...
@@ -28,9 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"LocalInteraction.H"
#include
"NoInteraction.H"
#include
"Rebound.H"
...
...
@@ -38,16 +35,14 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelPatchInteractionModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelPatchInteractionModels(CloudType) \
\
makePatchInteractionModel(
KC##Parcel
Type); \
makePatchInteractionModel(
Cloud
Type);
\
\
makePatchInteractionModelType(LocalInteraction,
KC##Parcel
Type); \
makePatchInteractionModelType(NoInteraction,
KC##Parcel
Type); \
makePatchInteractionModelType(Rebound,
KC##Parcel
Type); \
makePatchInteractionModelType(StandardWallInteraction,
KC##Parcel
Type);
makePatchInteractionModelType(LocalInteraction,
Cloud
Type);
\
makePatchInteractionModelType(NoInteraction,
Cloud
Type);
\
makePatchInteractionModelType(Rebound,
Cloud
Type);
\
makePatchInteractionModelType(StandardWallInteraction,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
View file @
94c54c1c
...
...
@@ -28,24 +28,19 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"NoPostProcessing.H"
#include
"ParticleTracks.H"
#include
"PatchPostProcessing.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelPostProcessingModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelPostProcessingModels(CloudType) \
\
makePostProcessingModel(
KC##Parcel
Type); \
makePostProcessingModel(
Cloud
Type);
\
\
makePostProcessingModelType(NoPostProcessing,
KC##Parcel
Type); \
makePostProcessingModelType(ParticleTracks,
KC##Parcel
Type); \
makePostProcessingModelType(PatchPostProcessing,
KC##Parcel
Type);
makePostProcessingModelType(NoPostProcessing,
Cloud
Type);
\
makePostProcessingModelType(ParticleTracks,
Cloud
Type);
\
makePostProcessingModelType(PatchPostProcessing,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeParcelSurfaceFilmModels.H
View file @
94c54c1c
...
...
@@ -28,19 +28,14 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"NoSurfaceFilm.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelSurfaceFilmModels(ParcelType) \
\
typedef KinematicCloud<Cloud<ParcelType> > KC##ParcelType; \
#define makeParcelSurfaceFilmModels(CloudType) \
\
makeSurfaceFilmModel(
KC##Parcel
Type); \
makeSurfaceFilmModelType(NoSurfaceFilm,
KC##Parcel
Type);
makeSurfaceFilmModel(
Cloud
Type);
\
makeSurfaceFilmModelType(NoSurfaceFilm,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
View file @
94c54c1c
...
...
@@ -28,24 +28,16 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"ThermoCloud.H"
#include
"ReactingCloud.H"
#include
"NoComposition.H"
#include
"SingleMixtureFraction.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeReactingMultiphaseParcelCompositionModels(ParcelType) \
\
typedef ReactingCloud<ThermoCloud<KinematicCloud<Cloud<ParcelType> > > > \
RTKC##ParcelType; \
#define makeReactingMultiphaseParcelCompositionModels(CloudType) \
\
makeCompositionModel(
RTKC##ParcelType);
\
makeCompositionModelType(NoComposition,
RTKC##ParcelType);
\
makeCompositionModelType(SingleMixtureFraction,
RTKC##Parcel
Type);
makeCompositionModel(
CloudType);
\
makeCompositionModelType(NoComposition,
CloudType);
\
makeCompositionModelType(SingleMixtureFraction,
Cloud
Type);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
View file @
94c54c1c
...
...
@@ -28,52 +28,21 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include
"Cloud.H"
#include
"KinematicCloud.H"
#include
"ThermoCloud.H"
#include
"ReactingCloud.H"
#include
"ReactingMultiphaseCloud.H"
#include
"ConstantRateDevolatilisation.H"
#include
"NoDevolatilisation.H"
#include
"SingleKineticRateDevolatilisation.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeReactingMultiphaseParcelDevolatilisationModels(ParcelType) \
\
typedef ReactingMultiphaseCloud \
< \
ReactingCloud \
< \
ThermoCloud \
< \
KinematicCloud \
< \
Cloud \
< \
ParcelType \
> \
> \
> \
> \
> RMPRTKC##ParcelType; \