zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Updated cloud sub-model macros

Browse Source
This commit is contained in:
andy
2011-03-24 12:33:57 +00:00
parent 2816819e4f
commit 8af299cc26
18 changed files with 193 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
View File

@ -50,27 +50,23 @@ License
namespace Foam namespace Foam
{ {
typedef coalCloud::cloudType coalCloud_R;
typedef coalCloud_R::cloudType coalCloud_T;
typedef coalCloud_T::cloudType coalCloud_K;
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(coalCloud_K); makeThermoParcelForces(coalCloud);
makeParcelDispersionModels(coalCloud_K); makeParcelDispersionModels(coalCloud);
makeReactingMultiphaseParcelInjectionModels(coalCloud_K); makeReactingMultiphaseParcelInjectionModels(coalCloud);
makeParcelPatchInteractionModels(coalCloud_K); makeParcelPatchInteractionModels(coalCloud);
makeParcelPostProcessingModels(coalCloud_K); makeParcelPostProcessingModels(coalCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(coalCloud_T); makeParcelHeatTransferModels(coalCloud);
// Reacting sub-models // Reacting sub-models
makeReactingMultiphaseParcelCompositionModels(coalCloud_R); makeReactingMultiphaseParcelCompositionModels(coalCloud);
makeReactingParcelPhaseChangeModels(coalCloud_R); makeReactingParcelPhaseChangeModels(coalCloud);
// Reacting multiphase sub-models // Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels(coalCloud); makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
makeReactingParcelSurfaceFilmModels(coalCloud_K); makeReactingParcelSurfaceFilmModels(coalCloud);
makeCoalParcelSurfaceReactionModels(coalCloud); makeCoalParcelSurfaceReactionModels(coalCloud);
} }

15
src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
View File

@ -39,16 +39,13 @@ License
namespace Foam namespace Foam
{ {
// Kinematic sub-models // Kinematic sub-models
typedef basicKinematicCollidingCloud::cloudType makeParcelForces(basicKinematicCollidingCloud);
basicKinematicCollidingCloud_K; makeParcelDispersionModels(basicKinematicCollidingCloud);
makeParcelInjectionModels(basicKinematicCollidingCloud);
makeParcelForces(basicKinematicCollidingCloud_K);
makeParcelDispersionModels(basicKinematicCollidingCloud_K);
makeParcelInjectionModels(basicKinematicCollidingCloud_K);
makeParcelCollisionModels(basicKinematicCollidingCloud); makeParcelCollisionModels(basicKinematicCollidingCloud);
makeParcelPatchInteractionModels(basicKinematicCollidingCloud_K); makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
makeParcelPostProcessingModels(basicKinematicCollidingCloud_K); makeParcelPostProcessingModels(basicKinematicCollidingCloud);
makeParcelSurfaceFilmModels(basicKinematicCollidingCloud_K); makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
} }

25
src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
View File

@ -48,29 +48,22 @@ License
namespace Foam namespace Foam
{ {
typedef basicReactingMultiphaseCloud::cloudType
basicReactingMultiphaseCloud_R;
typedef basicReactingMultiphaseCloud_R::cloudType
basicReactingMultiphaseCloud_T;
typedef basicReactingMultiphaseCloud_T::cloudType
basicReactingMultiphaseCloud_K;
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(basicReactingMultiphaseCloud_K); makeThermoParcelForces(basicReactingMultiphaseCloud);
makeParcelDispersionModels(basicReactingMultiphaseCloud_K); makeParcelDispersionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud_K); makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
makeParcelPatchInteractionModels(basicReactingMultiphaseCloud_K); makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
makeParcelPostProcessingModels(basicReactingMultiphaseCloud_K); makeParcelPostProcessingModels(basicReactingMultiphaseCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicReactingMultiphaseCloud_T); makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
// Reacting sub-models // Reacting sub-models
makeReactingMultiphaseParcelCompositionModels makeReactingMultiphaseParcelCompositionModels
( (
basicReactingMultiphaseCloud_R basicReactingMultiphaseCloud
); );
makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud_R); makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
// Reacting multiphase sub-models // Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels makeReactingMultiphaseParcelDevolatilisationModels
@ -79,7 +72,7 @@ namespace Foam
); );
makeReactingParcelSurfaceFilmModels makeReactingParcelSurfaceFilmModels
( (
basicReactingMultiphaseCloud_K basicReactingMultiphaseCloud
); );
makeReactingMultiphaseParcelSurfaceReactionModels makeReactingMultiphaseParcelSurfaceReactionModels
( (

18
src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
View File

@ -44,23 +44,23 @@ License
namespace Foam namespace Foam
{ {
typedef basicReactingCloud::cloudType basicReactingCloud_T; typedef basicReactingCloud::thermoCloudType thermoCloudType2;
typedef basicReactingCloud_T::cloudType basicReactingCloud_K; typedef basicReactingCloud::kinematicCloudType kinematicCloudType2;
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(basicReactingCloud_K); makeThermoParcelForces(basicReactingCloud);
makeParcelDispersionModels(basicReactingCloud_K); makeParcelDispersionModels(basicReactingCloud);
makeReactingParcelInjectionModels(basicReactingCloud_K); makeReactingParcelInjectionModels(basicReactingCloud);
makeParcelPatchInteractionModels(basicReactingCloud_K); makeParcelPatchInteractionModels(basicReactingCloud);
makeParcelPostProcessingModels(basicReactingCloud_K); makeParcelPostProcessingModels(basicReactingCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicReactingCloud_T); makeParcelHeatTransferModels(basicReactingCloud);
// Reacting sub-models // Reacting sub-models
makeReactingParcelCompositionModels(basicReactingCloud); makeReactingParcelCompositionModels(basicReactingCloud);
makeReactingParcelPhaseChangeModels(basicReactingCloud); makeReactingParcelPhaseChangeModels(basicReactingCloud);
makeReactingParcelSurfaceFilmModels(basicReactingCloud_K); makeReactingParcelSurfaceFilmModels(basicReactingCloud);
} }

15
src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
View File

@ -41,18 +41,15 @@ License
namespace Foam namespace Foam
{ {
// Kinematic sub-models // Kinematic sub-models
typedef basicThermoCloud::cloudType basicThermoCloud_K; makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud);
// Kinematic sub-models makeParcelInjectionModels(basicThermoCloud);
makeThermoParcelForces(basicThermoCloud_K); makeParcelPatchInteractionModels(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud_K); makeParcelPostProcessingModels(basicThermoCloud);
makeParcelInjectionModels(basicThermoCloud_K);
makeParcelPatchInteractionModels(basicThermoCloud_K);
makeParcelPostProcessingModels(basicThermoCloud_K);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicThermoCloud); makeParcelHeatTransferModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud_K); makeParcelSurfaceFilmModels(basicThermoCloud);
} }

7
src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
View File

@ -38,7 +38,12 @@ License
\ \
makeDispersionModel(CloudType); \ makeDispersionModel(CloudType); \
\ \
defineNamedTemplateTypeNameAndDebug(DispersionRASModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DispersionRASModel<kinematicCloudType>, \
0 \
); \
\ \
makeDispersionModelType(NoDispersion, CloudType); \ makeDispersionModelType(NoDispersion, CloudType); \
makeDispersionModelType(GradientDispersionRAS, CloudType); \ makeDispersionModelType(GradientDispersionRAS, CloudType); \

23
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
View File

@ -141,18 +141,27 @@ public:
#define makeCollisionModel(CloudType) \ #define makeCollisionModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(CollisionModel<CloudType>, 0); \ typedef CloudType::collidingCloudType collidingCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
defineTemplateRunTimeSelectionTable(CollisionModel<CloudType>, dictionary); ( \
CollisionModel<collidingCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
CollisionModel<collidingCloudType>, \
dictionary \
);
#define makeCollisionModelType(SS, CloudType) \ #define makeCollisionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<collidingCloudType>, 0); \
\ \
CollisionModel<CloudType>:: \ CollisionModel<collidingCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<collidingCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##collidingCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

15
src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
View File

@ -132,22 +132,23 @@ public:
#define makeDispersionModel(CloudType) \ #define makeDispersionModel(CloudType) \
\ \
defineTemplateTypeNameAndDebug(DispersionModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
\ defineTemplateTypeNameAndDebug(DispersionModel<kinematicCloudType>, 0); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
DispersionModel<CloudType>, \ DispersionModel<kinematicCloudType>, \
dictionary \ dictionary \
); );
#define makeDispersionModelType(SS, CloudType) \ #define makeDispersionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
DispersionModel<CloudType>:: \ DispersionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

22
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
View File

@ -328,17 +328,27 @@ public:
#define makeInjectionModel(CloudType) \ #define makeInjectionModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(InjectionModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
defineTemplateRunTimeSelectionTable(InjectionModel<CloudType>, dictionary); ( \
InjectionModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
InjectionModel<kinematicCloudType>, \
dictionary \
);
#define makeInjectionModelType(SS, CloudType) \ #define makeInjectionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
InjectionModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> >\ InjectionModel<kinematicCloudType>:: \
add##SS##CloudType##ConstructorToTable_; adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
View File

@ -188,16 +188,23 @@ public:
#define makeParticleForceModel(CloudType) \ #define makeParticleForceModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(ParticleForce<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineTemplateRunTimeSelectionTable(ParticleForce<CloudType>, dictionary); defineNamedTemplateTypeNameAndDebug(ParticleForce<kinematicCloudType>, 0);\
defineTemplateRunTimeSelectionTable \
( \
ParticleForce<kinematicCloudType>, \
dictionary \
);
#define makeParticleForceModelType(SS, CloudType) \ #define makeParticleForceModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
ParticleForce<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \ ParticleForce<kinematicCloudType>:: \
add##SS##CloudType##ConstructorToTable_; adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
View File

@ -192,22 +192,27 @@ public:
#define makePatchInteractionModel(CloudType) \ #define makePatchInteractionModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(PatchInteractionModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
( \
PatchInteractionModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PatchInteractionModel<CloudType>, \ PatchInteractionModel<kinematicCloudType>, \
dictionary \ dictionary \
); );
#define makePatchInteractionModelType(SS, CloudType) \ #define makePatchInteractionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
PatchInteractionModel<CloudType>:: \ PatchInteractionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
View File

@ -145,22 +145,27 @@ public:
#define makePostProcessingModel(CloudType) \ #define makePostProcessingModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(PostProcessingModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
( \
PostProcessingModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PostProcessingModel<CloudType>, \ PostProcessingModel<kinematicCloudType>, \
dictionary \ dictionary \
); );
#define makePostProcessingModelType(SS, CloudType) \ #define makePostProcessingModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
PostProcessingModel<CloudType>:: \ PostProcessingModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
View File

@ -243,22 +243,27 @@ public:
#define makeSurfaceFilmModel(CloudType) \ #define makeSurfaceFilmModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SurfaceFilmModel<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
( \
SurfaceFilmModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
SurfaceFilmModel<CloudType>, \ SurfaceFilmModel<kinematicCloudType>, \
dictionary \ dictionary \
); );
#define makeSurfaceFilmModelType(SS, CloudType) \ #define makeSurfaceFilmModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\ \
SurfaceFilmModel<CloudType>:: \ SurfaceFilmModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

15
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
View File

@ -267,26 +267,27 @@ public:
#define makeCompositionModel(CloudType) \ #define makeCompositionModel(CloudType) \
\ \
typedef CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
CompositionModel<CloudType>, \ CompositionModel<reactingCloudType>, \
0 \ 0 \
); \ ); \
\
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
CompositionModel<CloudType>, \ CompositionModel<reactingCloudType>, \
dictionary \ dictionary \
); );
#define makeCompositionModelType(SS, CloudType) \ #define makeCompositionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
\ \
CompositionModel<CloudType>:: \ CompositionModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<reactingCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##reactingCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
View File

@ -185,22 +185,27 @@ public:
#define makePhaseChangeModel(CloudType) \ #define makePhaseChangeModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(PhaseChangeModel<CloudType>, 0); \ typedef CloudType::reactingCloudType reactingCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
( \
PhaseChangeModel<reactingCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PhaseChangeModel<CloudType>, \ PhaseChangeModel<reactingCloudType>, \
dictionary \ dictionary \
); );
#define makePhaseChangeModelType(SS, CloudType) \ #define makePhaseChangeModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
\ \
PhaseChangeModel<CloudType>:: \ PhaseChangeModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<reactingCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##reactingCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
View File

@ -136,22 +136,29 @@ public:
#define makeDevolatilisationModel(CloudType) \ #define makeDevolatilisationModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(DevolatilisationModel<CloudType>, 0); \ typedef CloudType::reactingMultiphaseCloudType \
\ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DevolatilisationModel<reactingMultiphaseCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
DevolatilisationModel<CloudType>, \ DevolatilisationModel<reactingMultiphaseCloudType>, \
dictionary \ dictionary \
); );
#define makeDevolatilisationModelType(SS, CloudType) \ #define makeDevolatilisationModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
\ \
DevolatilisationModel<CloudType>:: \ DevolatilisationModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
View File

@ -149,22 +149,29 @@ public:
#define makeSurfaceReactionModel(CloudType) \ #define makeSurfaceReactionModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SurfaceReactionModel<CloudType>, 0); \ typedef CloudType::reactingMultiphaseCloudType \
\ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
SurfaceReactionModel<CloudType>, \ SurfaceReactionModel<reactingMultiphaseCloudType>, \
dictionary \ dictionary \
); );
#define makeSurfaceReactionModelType(SS, CloudType) \ #define makeSurfaceReactionModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
\ \
SurfaceReactionModel<CloudType>:: \ SurfaceReactionModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
View File

@ -155,22 +155,27 @@ public:
#define makeHeatTransferModel(CloudType) \ #define makeHeatTransferModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(HeatTransferModel<CloudType>, 0); \ typedef CloudType::thermoCloudType thermoCloudType; \
\ defineNamedTemplateTypeNameAndDebug \
( \
HeatTransferModel<thermoCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
HeatTransferModel<CloudType>, \ HeatTransferModel<thermoCloudType>, \
dictionary \ dictionary \
); );
#define makeHeatTransferModelType(SS, CloudType) \ #define makeHeatTransferModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ typedef CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<thermoCloudType>, 0); \
\ \
HeatTransferModel<CloudType>:: \ HeatTransferModel<thermoCloudType>:: \
adddictionaryConstructorToTable<SS<CloudType> > \ adddictionaryConstructorToTable<SS<thermoCloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##thermoCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //