songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for reading and updating the debug switches of templated

Browse Source 
classes in the DebugSwitches sub-dictionary of system/controlDict
This commit is contained in:
Henry 2015-02-04 22:08:27 +00:00
parent 03316b008b
commit 1a806fa28d
94 changed files with 1203 additions and 1241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/OpenFOAM/db/typeInfo/debugName.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,6 +40,46 @@ Description
// definitions (debug information only)
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
namespace Foam
{
//- Define the debug information, lookup as \a Name
template<class Type>
class AddToDebug
:
public ::Foam::simpleRegIOobject
{
public:
//- The unique AddToDebug object
static const AddToDebug addToDebug;
AddToDebug(const char* name)
:
::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)
{}
virtual ~AddToDebug()
{}
virtual void readData(Foam::Istream& is)
{
Type::debug = readLabel(is);
}
virtual void writeData(Foam::Ostream& os) const
{
os << Type::debug;
}
};
} // End namespace Foam
#define registerTemplateDebugSwitchWithName(Type,Name) \
template<> \
const Foam::AddToDebug<Type> Foam::AddToDebug<Type>::addToDebug(Name)
//- Define the debug information, lookup as \a Name
#define registerDebugSwitchWithName(Type,Tag,Name) \
class add##Tag##ToDebug \
@ -135,11 +175,13 @@ Description
//- Define the debug information for templates, lookup as \a Name
# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \
defineDebugSwitchWithName(Type, Name, DebugSwitch)
defineDebugSwitchWithName(Type, Name, DebugSwitch); \
registerTemplateDebugSwitchWithName(Type, Name)
//- Define the debug information for templates sub-classes, lookup as \a Name
# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \
defineDebugSwitchWithName(Type, Name, DebugSwitch)
defineDebugSwitchWithName(Type, Name, DebugSwitch); \
registerTemplateDebugSwitchWithName(Type, Name)
#endif
//- Define the debug information for templates

58
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
View File

@ -27,43 +27,39 @@ License
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTemplateTypeNameAndDebugWithName
(
Foam::compressible::constSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hConstSolidThermoPhysics>",
0
);
defineTemplateTypeNameAndDebugWithName
(
Foam::compressible::expoSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hExponentialSolidThermoPhysics>",
0
);
namespace Foam
{
namespace compressible
{
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
constSolid_thermalBaffle1DFvPatchScalarField
);
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
expoSolid_thermalBaffle1DFvPatchScalarField
);
}
}
defineTemplateTypeNameAndDebugWithName
(
constSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hConstSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
constSolid_thermalBaffle1DFvPatchScalarField
);
defineTemplateTypeNameAndDebugWithName
(
expoSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hExponentialSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField,
expoSolid_thermalBaffle1DFvPatchScalarField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace compressible
} // End namespace Foam
// ************************************************************************* //

6
src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
View File

@ -90,14 +90,16 @@ License
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
typedef Foam::SType##Models::Type<Foam::eddyDiffusivity<Foam::BaseModel> > \
Type##SType##BaseModel; \
defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
\
namespace Foam \
{ \
namespace SType##Models \
{ \
typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel; \
\
defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
\
addToRunTimeSelectionTable \
( \
SType##BaseModel, \

7
src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,14 +88,15 @@ License
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
defineNamedTemplateTypeNameAndDebug \
(Foam::SType##Models::Type<Foam::BaseModel>, 0); \
\
namespace Foam \
{ \
namespace SType##Models \
{ \
typedef Type<BaseModel> Type##SType##BaseModel; \
\
defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
\
addToRunTimeSelectionTable \
( \
SType##BaseModel, \

124
src/combustionModels/FSD/FSDs.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,77 +34,71 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
// Combustion models based on sensibleEnthalpy
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
// Combustion models based on sensibleEnthalpy
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
// Combustion models based on sensibleInternalEnergy
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
// Combustion models based on sensibleInternalEnergy
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
}
}
makeCombustionTypesThermo
(
FSD,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/combustionModels/PaSR/PaSRs.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,14 +31,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
makeCombustionTypes(PaSR, psiChemistryCombustion, psiCombustionModel);
makeCombustionTypes(PaSR, rhoChemistryCombustion, rhoCombustionModel);
}
}
makeCombustionTypes(PaSR, psiChemistryCombustion, psiCombustionModel);
makeCombustionTypes(PaSR, rhoChemistryCombustion, rhoCombustionModel);
// ************************************************************************* //

90
src/combustionModels/combustionModel/makeCombustionTypes.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,43 +30,61 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \
\
typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
CombModel##CombType##Thermo, \
#CombModel"<"#CombType","#Thermo">", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
Table, \
CombModel##CombType##Thermo, \
dictionary \
);
#define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \
\
typedef Foam::combustionModels::CombModel \
<Foam::combustionModels::CombType, Foam::Thermo> \
CombModel##CombType##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
CombModel##CombType##Thermo, \
#CombModel"<"#CombType","#Thermo">", \
0 \
); \
\
namespace Foam \
{ \
namespace combustionModels \
{ \
typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \
addToRunTimeSelectionTable \
( \
Table, \
CombModel##CombType##Thermo, \
dictionary \
); \
} \
}
#define makeCombustionTypes(CombModel, CombType, Table) \
\
typedef CombModel<CombType> CombModel##CombType; \
\
defineTemplateTypeNameAndDebugWithName \
( \
CombModel##CombType, \
#CombModel"<"#CombType">", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
Table, \
CombModel##CombType, \
dictionary \
);
#define makeCombustionTypes(CombModel, CombType, Table) \
\
typedef Foam::combustionModels::CombModel \
<Foam::combustionModels::CombType> \
CombModel##CombType; \
\
defineTemplateTypeNameAndDebugWithName \
( \
CombModel##CombType, \
#CombModel"<"#CombType">", \
0 \
); \
\
namespace Foam \
{ \
namespace combustionModels \
{ \
typedef CombModel<CombType> CombModel##CombType; \
\
addToRunTimeSelectionTable \
( \
Table, \
CombModel##CombType, \
dictionary \
); \
} \
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

124
src/combustionModels/diffusion/diffusions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,78 +32,72 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
// Combustion models based on sensibleEnthalpy
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
// Combustion models based on sensibleEnthalpy
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
// Combustion models based on sensibleInternalEnergy
// Combustion models based on sensibleInternalEnergy
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
}
}
makeCombustionTypesThermo
(
diffusion,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

124
src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,79 +32,73 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
// Combustion models based on sensibleEnthalpy
// Combustion models based on sensibleEnthalpy
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
gasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
constGasHThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
gasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
constGasHThermoPhysics,
rhoCombustionModel
);
// Combustion models based on sensibleInternalEnergy
// Combustion models based on sensibleInternalEnergy
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
gasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
psiThermoCombustion,
constGasEThermoPhysics,
psiCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
gasEThermoPhysics,
rhoCombustionModel
);
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
}
}
makeCombustionTypesThermo
(
infinitelyFastChemistry,
rhoThermoCombustion,
constGasEThermoPhysics,
rhoCombustionModel
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/combustionModels/laminar/laminars.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,14 +31,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
makeCombustionTypes(laminar, psiChemistryCombustion, psiCombustionModel);
makeCombustionTypes(laminar, rhoChemistryCombustion, rhoCombustionModel);
}
}
makeCombustionTypes(laminar, psiChemistryCombustion, psiCombustionModel);
makeCombustionTypes(laminar, rhoChemistryCombustion, rhoCombustionModel);
// ************************************************************************* //

32
src/combustionModels/noCombustion/noCombustions.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,25 +34,19 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace combustionModels
{
makeCombustionTypes
(
noCombustion,
psiThermoCombustion,
psiCombustionModel
);
makeCombustionTypes
(
noCombustion,
psiThermoCombustion,
psiCombustionModel
);
makeCombustionTypes
(
noCombustion,
rhoThermoCombustion,
rhoCombustionModel
);
}
}
makeCombustionTypes
(
noCombustion,
rhoThermoCombustion,
rhoCombustionModel
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvConvectionScheme(boundedConvectionScheme)
}
}
makeFvConvectionScheme(boundedConvectionScheme)
// ************************************************************************* //

30
src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -204,12 +204,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvConvectionTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvConvectionScheme(SS) \
\
@ -221,11 +225,17 @@ makeFvConvectionTypeScheme(SS, tensor)
#define makeMultivariateFvConvectionTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
convectionScheme<Type>::addMultivariateConstructorToTable<SS<Type> > \
add##SS##Type##MultivariateConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
convectionScheme<Type>:: \
addMultivariateConstructorToTable<SS<Type> > \
add##SS##Type##MultivariateConstructorToTable_; \
} \
}
#define makeMultivariateFvConvectionScheme(SS) \

18
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
int warnUnboundedGauss
(
Foam::debug::debugSwitch("warnUnboundedGauss", true)
);
int Foam::fv::warnUnboundedGauss
(
Foam::debug::debugSwitch("warnUnboundedGauss", true)
);
makeFvConvectionScheme(gaussConvectionScheme)
}
}
makeFvConvectionScheme(gaussConvectionScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
}
}
makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Schemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvD2dt2Scheme(EulerD2dt2Scheme)
}
}
makeFvD2dt2Scheme(EulerD2dt2Scheme)
// ************************************************************************* //

16
src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -181,12 +181,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvD2dt2TypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvD2dt2Scheme(SS) \
\

10
src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
}
}
makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(CoEulerDdtScheme)
}
}
makeFvDdtScheme(CoEulerDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(CrankNicolsonDdtScheme)
}
}
makeFvDdtScheme(CrankNicolsonDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(EulerDdtScheme)
}
}
makeFvDdtScheme(EulerDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(SLTSDdtScheme)
}
}
makeFvDdtScheme(SLTSDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(backwardDdtScheme)
}
}
makeFvDdtScheme(backwardDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(boundedDdtScheme)
}
}
makeFvDdtScheme(boundedDdtScheme)
// ************************************************************************* //

24
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -257,12 +257,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvDdtTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
ddtScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
ddtScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvDdtScheme(SS) \
\
@ -272,6 +276,11 @@ makeFvDdtTypeScheme(SS, sphericalTensor) \
makeFvDdtTypeScheme(SS, symmTensor) \
makeFvDdtTypeScheme(SS, tensor) \
\
namespace Foam \
{ \
namespace fv \
{ \
\
template<> \
tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr \
( \
@ -316,6 +325,9 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr \
{ \
notImplemented(#SS"<scalar>::fvcDdtPhiCorr"); \
return surfaceScalarField::null(); \
} \
\
} \
}

10
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(localEulerDdtScheme)
}
}
makeFvDdtScheme(localEulerDdtScheme)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDdtScheme(steadyStateDdtScheme)
}
}
makeFvDdtScheme(steadyStateDdtScheme)
// ************************************************************************* //

16
src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -165,12 +165,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvDivTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvDivScheme(SS) \
\

10
src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvDivScheme(gaussDivScheme)
}
}
makeFvDivScheme(gaussDivScheme)
// ************************************************************************* //

47
src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -142,24 +142,35 @@ public:
// Add the patch constructor functions to the hash tables
#define makeLeastSquaresGradTypeScheme(SS, STENCIL, TYPE) \
\
typedef LeastSquaresGrad<TYPE, STENCIL> LeastSquaresGrad##TYPE##STENCIL##_; \
defineTemplateTypeNameAndDebugWithName \
(LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \
\
gradScheme<TYPE>::addIstreamConstructorToTable \
<LeastSquaresGrad<TYPE, STENCIL> > \
add##SS##STENCIL##TYPE##IstreamConstructorToTable_;
#define makeLeastSquaresGradTypeScheme(SS, STENCIL, TYPE) \
typedef Foam::fv::LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> \
LeastSquaresGrad##TYPE##STENCIL##_; \
\
defineTemplateTypeNameAndDebugWithName \
(LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \
\
namespace Foam \
{ \
namespace fv \
{ \
typedef LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> \
LeastSquaresGrad##TYPE##STENCIL##_; \
\
gradScheme<Foam::TYPE>::addIstreamConstructorToTable \
<LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> > \
add##SS##STENCIL##TYPE##IstreamConstructorToTable_; \
} \
}
#define makeLeastSquaresGradScheme(SS, STENCIL) \
\
typedef LeastSquaresVectors<STENCIL> LeastSquaresVectors##STENCIL##_; \
defineTemplateTypeNameAndDebugWithName \
(LeastSquaresVectors##STENCIL##_, #SS, 0); \
\
makeLeastSquaresGradTypeScheme(SS,STENCIL,scalar) \
makeLeastSquaresGradTypeScheme(SS,STENCIL,vector)
#define makeLeastSquaresGradScheme(SS, STENCIL) \
typedef Foam::fv::LeastSquaresVectors<Foam::STENCIL> \
LeastSquaresVectors##STENCIL##_; \
\
defineTemplateTypeNameAndDebugWithName \
(LeastSquaresVectors##STENCIL##_, #SS, 0); \
\
makeLeastSquaresGradTypeScheme(SS,STENCIL,scalar) \
makeLeastSquaresGradTypeScheme(SS,STENCIL,vector)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

38
src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -30,28 +30,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
// makeLeastSquaresGradScheme
// (
// faceCellsLeastSquares,
// centredCFCCellToCellStencilObject
// )
// makeLeastSquaresGradScheme
// (
// faceCellsLeastSquares,
// centredCFCCellToCellStencilObject
// )
makeLeastSquaresGradScheme
(
pointCellsLeastSquares,
centredCPCCellToCellStencilObject
)
makeLeastSquaresGradScheme
(
pointCellsLeastSquares,
centredCPCCellToCellStencilObject
)
makeLeastSquaresGradScheme
(
edgeCellsLeastSquares,
centredCECCellToCellStencilObject
)
}
}
makeLeastSquaresGradScheme
(
edgeCellsLeastSquares,
centredCECCellToCellStencilObject
)
// ************************************************************************* //

12
src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,14 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(fourthGrad)
} // End namespace fv
} // End namespace Foam
makeFvGradScheme(fourthGrad)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(gaussGrad)
}
}
makeFvGradScheme(gaussGrad)
// ************************************************************************* //

15
src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvGradTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvGradScheme(SS) \

10
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(leastSquaresGrad)
}
}
makeFvGradScheme(leastSquaresGrad)
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,13 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(cellLimitedGrad)
}
}
makeFvGradScheme(cellLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(cellMDLimitedGrad)
}
}
makeFvGradScheme(cellMDLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(faceLimitedGrad)
}
}
makeFvGradScheme(faceLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,13 +34,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvGradScheme(faceMDLimitedGrad)
}
}
makeFvGradScheme(faceMDLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvLaplacianScheme(gaussLaplacianScheme)
}
}
makeFvLaplacianScheme(gaussLaplacianScheme)
#define declareFvmLaplacianScalarGamma(Type) \
\

19
src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -212,13 +212,20 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvLaplacianTypeScheme(SS, GType, Type) \
\
typedef SS<Type, GType> SS##Type##GType; \
typedef Foam::fv::SS<Foam::Type, Foam::GType> SS##Type##GType; \
defineNamedTemplateTypeNameAndDebug(SS##Type##GType, 0); \
\
laplacianScheme<Type, GType>:: \
addIstreamConstructorToTable<SS<Type, GType> > \
add##SS##Type##GType##IstreamConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
typedef SS<Type, GType> SS##Type##GType; \
\
laplacianScheme<Type, GType>:: \
addIstreamConstructorToTable<SS<Type, GType> > \
add##SS##Type##GType##IstreamConstructorToTable_; \
} \
}
#define makeFvLaplacianScheme(SS) \

43
src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,24 +156,31 @@ public:
// Add the patch constructor functions to the hash tables
#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
\
typedef CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> \
CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \
defineTemplateTypeNameAndDebugWithName \
(CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \
\
snGradScheme<TYPE>::addMeshConstructorToTable \
<CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \
add##SS##STENCIL##TYPE##MeshConstructorToTable_;
#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
typedef Foam::fv::CentredFitSnGradScheme \
<Foam::TYPE, Foam::POLYNOMIAL, Foam::STENCIL> \
CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \
\
defineTemplateTypeNameAndDebugWithName \
(CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \
\
namespace Foam \
{ \
namespace fv \
{ \
snGradScheme<TYPE>::addMeshConstructorToTable \
<CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \
add##SS##STENCIL##TYPE##MeshConstructorToTable_; \
} \
}
#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \
\
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \
\
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,14 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeSnGradScheme(correctedSnGrad)
}
}
makeSnGradScheme(correctedSnGrad)
template<>
Foam::tmp<Foam::surfaceScalarField>

10
src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeSnGradScheme(faceCorrectedSnGrad)
}
}
makeSnGradScheme(faceCorrectedSnGrad)
template<>

10
src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,12 +35,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeSnGradScheme(limitedSnGrad)
}
}
makeSnGradScheme(limitedSnGrad)
// ************************************************************************* //

19
src/finiteVolume/finiteVolume/snGradSchemes/linearFitSnGrad/linearFitSnGrads.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,16 +36,13 @@ namespace Foam
CentredFitSnGradData<linearFitPolynomial>,
0
);
namespace fv
{
makeCentredFitSnGradScheme
(
linearFit,
linearFitPolynomial,
centredFECCellToFaceStencilObject
);
}
}
makeCentredFitSnGradScheme
(
linearFit,
linearFitPolynomial,
centredFECCellToFaceStencilObject
);
// ************************************************************************* //

10
src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,12 +31,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeSnGradScheme(orthogonalSnGrad)
}
}
makeSnGradScheme(orthogonalSnGrad)
// ************************************************************************* //

20
src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,16 +36,14 @@ namespace Foam
CentredFitSnGradData<quadraticFitPolynomial>,
0
);
namespace fv
{
makeCentredFitSnGradScheme
(
quadraticFit,
quadraticFitPolynomial,
centredCFCCellToFaceStencilObject
);
}
}
makeCentredFitSnGradScheme
(
quadraticFit,
quadraticFitPolynomial,
centredCFCCellToFaceStencilObject
);
// ************************************************************************* //

15
src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeSnGradTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
\
snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \
add##SS##Type##MeshConstructorToTable_;
namespace Foam \
{ \
namespace fv \
{ \
snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \
add##SS##Type##MeshConstructorToTable_; \
} \
}
#define makeSnGradScheme(SS) \
\

10
src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrads.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,12 +31,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeSnGradScheme(uncorrectedSnGrad)
}
}
makeSnGradScheme(uncorrectedSnGrad)
// ************************************************************************* //

18
src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvOption(ExplicitSetValue, scalar);
makeFvOption(ExplicitSetValue, vector);
makeFvOption(ExplicitSetValue, sphericalTensor);
makeFvOption(ExplicitSetValue, symmTensor);
makeFvOption(ExplicitSetValue, tensor);
}
}
makeFvOption(ExplicitSetValue, scalar);
makeFvOption(ExplicitSetValue, vector);
makeFvOption(ExplicitSetValue, sphericalTensor);
makeFvOption(ExplicitSetValue, symmTensor);
makeFvOption(ExplicitSetValue, tensor);
// ************************************************************************* //

7
src/fvOptions/fvOptions/makeFvOption.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,12 +35,13 @@ License
\
defineTemplateTypeNameAndDebugWithName \
( \
Option<Type>, \
Foam::fv::Option<Foam::Type>, \
#Type#Option, \
0 \
); \
\
option::adddictionaryConstructorToTable<Option<Type> > \
Foam::fv::option::adddictionaryConstructorToTable \
<Foam::fv::Option<Foam::Type> > \
add##Option##Type##dictionary##ConstructorTooptionTable_

18
src/fvOptions/sources/general/codedSource/codedSource.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvOption(CodedSource, scalar);
makeFvOption(CodedSource, vector);
makeFvOption(CodedSource, sphericalTensor);
makeFvOption(CodedSource, symmTensor);
makeFvOption(CodedSource, tensor);
}
}
makeFvOption(CodedSource, scalar);
makeFvOption(CodedSource, vector);
makeFvOption(CodedSource, sphericalTensor);
makeFvOption(CodedSource, symmTensor);
makeFvOption(CodedSource, tensor);
// ************************************************************************* //

18
src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace fv
{
makeFvOption(SemiImplicitSource, scalar);
makeFvOption(SemiImplicitSource, vector);
makeFvOption(SemiImplicitSource, sphericalTensor);
makeFvOption(SemiImplicitSource, symmTensor);
makeFvOption(SemiImplicitSource, tensor);
}
}
makeFvOption(SemiImplicitSource, scalar);
makeFvOption(SemiImplicitSource, vector);
makeFvOption(SemiImplicitSource, sphericalTensor);
makeFvOption(SemiImplicitSource, symmTensor);
makeFvOption(SemiImplicitSource, tensor);
// ************************************************************************* //

4
src/lagrangian/Turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
View File

@ -35,10 +35,10 @@ License
#define makeParcelTurbulenceDispersionModels(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DispersionRASModel<kinematicCloudType>, \
Foam::DispersionRASModel<kinematicCloudType>, \
0 \
); \
\

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,19 +38,16 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicKinematicCollidingCloud);
makeParcelCloudFunctionObjects(basicKinematicCollidingCloud);
// Kinematic sub-models
makeParcelForces(basicKinematicCollidingCloud);
makeParcelDispersionModels(basicKinematicCollidingCloud);
makeParcelInjectionModels(basicKinematicCollidingCloud);
makeParcelCollisionModels(basicKinematicCollidingCloud);
makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
makeParcelStochasticCollisionModels(basicKinematicCollidingCloud);
makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
}
// Kinematic sub-models
makeParcelForces(basicKinematicCollidingCloud);
makeParcelDispersionModels(basicKinematicCollidingCloud);
makeParcelInjectionModels(basicKinematicCollidingCloud);
makeParcelCollisionModels(basicKinematicCollidingCloud);
makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
makeParcelStochasticCollisionModels(basicKinematicCollidingCloud);
makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
// ************************************************************************* //

32
src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -27,7 +27,7 @@ License
#include "makeParcelCloudFunctionObjects.H"
// kinematic sub-models
// Kinematic sub-models
#include "makeParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeParcelInjectionModels.H"
@ -42,23 +42,21 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicKinematicMPPICCloud);
makeParcelCloudFunctionObjects(basicKinematicMPPICCloud);
// kinematic sub-models
makeParcelForces(basicKinematicMPPICCloud);
makeParcelDispersionModels(basicKinematicMPPICCloud);
makeParcelInjectionModels(basicKinematicMPPICCloud);
makeParcelPatchInteractionModels(basicKinematicMPPICCloud);
makeParcelStochasticCollisionModels(basicKinematicMPPICCloud);
makeParcelSurfaceFilmModels(basicKinematicMPPICCloud);
// Kinematic sub-models
makeParcelForces(basicKinematicMPPICCloud);
// MPPIC sub-models
makeMPPICParcelDampingModels(basicKinematicMPPICCloud);
makeMPPICParcelIsotropyModels(basicKinematicMPPICCloud);
makeMPPICParcelPackingModels(basicKinematicMPPICCloud);
}
makeParcelDispersionModels(basicKinematicMPPICCloud);
makeParcelInjectionModels(basicKinematicMPPICCloud);
makeParcelPatchInteractionModels(basicKinematicMPPICCloud);
makeParcelStochasticCollisionModels(basicKinematicMPPICCloud);
makeParcelSurfaceFilmModels(basicKinematicMPPICCloud);
// MPPIC sub-models
makeMPPICParcelDampingModels(basicKinematicMPPICCloud);
makeMPPICParcelIsotropyModels(basicKinematicMPPICCloud);
makeMPPICParcelPackingModels(basicKinematicMPPICCloud);
// ************************************************************************* //

21
src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,18 +37,15 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicKinematicCloud);
makeParcelCloudFunctionObjects(basicKinematicCloud);
// Kinematic sub-models
makeParcelForces(basicKinematicCloud);
makeParcelDispersionModels(basicKinematicCloud);
makeParcelInjectionModels(basicKinematicCloud);
makeParcelPatchInteractionModels(basicKinematicCloud);
makeParcelStochasticCollisionModels(basicKinematicCloud);
makeParcelSurfaceFilmModels(basicKinematicCloud);
}
// Kinematic sub-models
makeParcelForces(basicKinematicCloud);
makeParcelDispersionModels(basicKinematicCloud);
makeParcelInjectionModels(basicKinematicCloud);
makeParcelPatchInteractionModels(basicKinematicCloud);
makeParcelStochasticCollisionModels(basicKinematicCloud);
makeParcelSurfaceFilmModels(basicKinematicCloud);
// ************************************************************************* //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -48,41 +48,38 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
// Kinematic sub-models
makeThermoParcelForces(basicReactingMultiphaseCloud);
makeParcelDispersionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelStochasticCollisionModels
(
basicReactingMultiphaseCloud
);
makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud);
// Kinematic sub-models
makeThermoParcelForces(basicReactingMultiphaseCloud);
makeParcelDispersionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelStochasticCollisionModels
(
basicReactingMultiphaseCloud
);
makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
// Reacting sub-models
makeReactingMultiphaseParcelCompositionModels
(
basicReactingMultiphaseCloud
);
makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
// Reacting sub-models
makeReactingMultiphaseParcelCompositionModels
(
basicReactingMultiphaseCloud
);
makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
// Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels
(
basicReactingMultiphaseCloud
);
makeReactingMultiphaseParcelSurfaceReactionModels
(
basicReactingMultiphaseCloud
);
}
// Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels
(
basicReactingMultiphaseCloud
);
makeReactingMultiphaseParcelSurfaceReactionModels
(
basicReactingMultiphaseCloud
);
// ************************************************************************* //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,25 +44,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicReactingCloud);
makeParcelCloudFunctionObjects(basicReactingCloud);
// Kinematic sub-models
makeThermoParcelForces(basicReactingCloud);
makeParcelDispersionModels(basicReactingCloud);
makeReactingParcelInjectionModels(basicReactingCloud);
makeParcelPatchInteractionModels(basicReactingCloud);
makeParcelStochasticCollisionModels(basicReactingCloud);
makeReactingParcelSurfaceFilmModels(basicReactingCloud);
// Kinematic sub-models
makeThermoParcelForces(basicReactingCloud);
makeParcelDispersionModels(basicReactingCloud);
makeReactingParcelInjectionModels(basicReactingCloud);
makeParcelPatchInteractionModels(basicReactingCloud);
makeParcelStochasticCollisionModels(basicReactingCloud);
makeReactingParcelSurfaceFilmModels(basicReactingCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicReactingCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicReactingCloud);
// Reacting sub-models
makeReactingParcelCompositionModels(basicReactingCloud);
makeReactingParcelPhaseChangeModels(basicReactingCloud);
}
// Reacting sub-models
makeReactingParcelCompositionModels(basicReactingCloud);
makeReactingParcelPhaseChangeModels(basicReactingCloud);
// ************************************************************************* //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,21 +40,18 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicThermoCloud);
makeParcelCloudFunctionObjects(basicThermoCloud);
// Kinematic sub-models
makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud);
makeParcelInjectionModels(basicThermoCloud);
makeParcelPatchInteractionModels(basicThermoCloud);
makeParcelStochasticCollisionModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud);
// Kinematic sub-models
makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud);
makeParcelInjectionModels(basicThermoCloud);
makeParcelPatchInteractionModels(basicThermoCloud);
makeParcelStochasticCollisionModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicThermoCloud);
}
// Thermo sub-models
makeParcelHeatTransferModels(basicThermoCloud);
// ************************************************************************* //

10
src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,11 +38,9 @@ License
\
makeDampingModel(CloudType); \
\
namespace DampingModels \
{ \
makeDampingModelType(NoDamping, CloudType); \
makeDampingModelType(Relaxation, CloudType); \
}
makeDampingModelType(NoDamping, CloudType); \
makeDampingModelType(Relaxation, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,11 +37,8 @@ License
\
makeIsotropyModel(CloudType); \
\
namespace IsotropyModels \
{ \
makeIsotropyModelType(NoIsotropy, CloudType); \
makeIsotropyModelType(Stochastic, CloudType); \
}
makeIsotropyModelType(NoIsotropy, CloudType); \
makeIsotropyModelType(Stochastic, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,12 +38,9 @@ License
\
makePackingModel(CloudType); \
\
namespace PackingModels \
{ \
makePackingModelType(NoPacking, CloudType); \
makePackingModelType(Explicit, CloudType); \
makePackingModelType(Implicit, CloudType); \
}
makePackingModelType(NoPacking, CloudType); \
makePackingModelType(Explicit, CloudType); \
makePackingModelType(Implicit, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelStochasticCollisionModels(CloudType) \
#define makeParcelStochasticCollisionModels(CloudType) \
\
makeStochasticCollisionModel(CloudType); \
makeStochasticCollisionModelType(NoStochasticCollision, CloudType);

45
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -186,28 +186,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeCloudFunctionObject(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
CloudFunctionObject<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
CloudFunctionObject<kinematicCloudType>, \
dictionary \
);
#define makeCloudFunctionObject(CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::CloudFunctionObject<kinematicCloudType>, \
0 \
); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
CloudFunctionObject<kinematicCloudType>, \
dictionary \
); \
}
#define makeCloudFunctionObjectType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\
CloudFunctionObject<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
#define makeCloudFunctionObjectType(SS, CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
Foam::CloudFunctionObject<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -141,26 +141,29 @@ public:
#define makeCollisionModel(CloudType) \
\
typedef CloudType::collidingCloudType collidingCloudType; \
typedef Foam::CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
CollisionModel<collidingCloudType>, \
Foam::CollisionModel<collidingCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
CollisionModel<collidingCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
CollisionModel<collidingCloudType>, \
dictionary \
); \
}
#define makeCollisionModelType(SS, CloudType) \
\
typedef CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<collidingCloudType>, 0); \
typedef Foam::CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0); \
\
CollisionModel<collidingCloudType>:: \
adddictionaryConstructorToTable<SS<collidingCloudType> > \
Foam::CollisionModel<collidingCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<collidingCloudType> > \
add##SS##CloudType##collidingCloudType##ConstructorToTable_;

22
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -146,20 +146,24 @@ public:
#define makePairModel(CloudType) \
\
defineNamedTemplateTypeNameAndDebug(PairModel<CloudType>, 0); \
defineNamedTemplateTypeNameAndDebug(Foam::PairModel<Foam::CloudType>, 0); \
\
defineTemplateRunTimeSelectionTable \
( \
PairModel<CloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
PairModel<Foam::CloudType>, \
dictionary \
); \
}
#define makePairModelType(SS, CloudType) \
\
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \
defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0); \
\
PairModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \
Foam::PairModel<Foam::CloudType>:: \
adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> > \
add##SS##CloudType##ConstructorToTable_;

24
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,21 +156,25 @@ public:
#define makeWallModel(CloudType) \
\
defineNamedTemplateTypeNameAndDebug(WallModel<CloudType>, 0); \
defineNamedTemplateTypeNameAndDebug(Foam::WallModel<Foam::CloudType>, 0); \
\
defineTemplateRunTimeSelectionTable \
( \
WallModel<CloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
WallModel<Foam::CloudType>, \
dictionary \
); \
}
#define makeWallModelType(SS, CloudType) \
\
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \
defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0); \
\
WallModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \
add##SS##CloudType##ConstructorToTable_;
Foam::WallModel<Foam::CloudType>:: \
adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> > \
add##SS##CloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -132,22 +132,26 @@ public:
#define makeDispersionModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineTemplateTypeNameAndDebug(DispersionModel<kinematicCloudType>, 0); \
defineTemplateRunTimeSelectionTable \
( \
DispersionModel<kinematicCloudType>, \
dictionary \
);
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineTemplateTypeNameAndDebug \
(Foam::DispersionModel<kinematicCloudType>, 0); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
DispersionModel<kinematicCloudType>, \
dictionary \
); \
}
#define makeDispersionModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
DispersionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
Foam::DispersionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -357,27 +357,31 @@ public:
#define makeInjectionModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
InjectionModel<kinematicCloudType>, \
Foam::InjectionModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
InjectionModel<kinematicCloudType>, \
dictionary \
);
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
InjectionModel<kinematicCloudType>, \
dictionary \
); \
}
#define makeInjectionModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
InjectionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
Foam::InjectionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -193,25 +193,30 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParticleForceModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(ParticleForce<kinematicCloudType>, 0);\
defineTemplateRunTimeSelectionTable \
( \
ParticleForce<kinematicCloudType>, \
dictionary \
);
#define makeParticleForceModel(CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
(Foam::ParticleForce<kinematicCloudType>, 0); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
ParticleForce<kinematicCloudType>, \
dictionary \
); \
}
#define makeParticleForceModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\
ParticleForce<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
#define makeParticleForceModelType(SS, CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
Foam::ParticleForce<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -174,26 +174,30 @@ public:
#define makePatchInteractionModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
PatchInteractionModel<kinematicCloudType>, \
Foam::PatchInteractionModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
PatchInteractionModel<kinematicCloudType>, \
dictionary \
);
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
PatchInteractionModel<kinematicCloudType>, \
dictionary \
); \
}
#define makePatchInteractionModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
PatchInteractionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
Foam::PatchInteractionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

39
src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
View File

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -131,28 +131,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeStochasticCollisionModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
StochasticCollisionModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
StochasticCollisionModel<kinematicCloudType>, \
dictionary \
);
#define makeStochasticCollisionModel(CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::StochasticCollisionModel<kinematicCloudType>, \
0 \
); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
StochasticCollisionModel<kinematicCloudType>, \
dictionary \
); \
}
#define makeStochasticCollisionModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
StochasticCollisionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
Foam::StochasticCollisionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -235,28 +235,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSurfaceFilmModel(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
SurfaceFilmModel<kinematicCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
SurfaceFilmModel<kinematicCloudType>, \
dictionary \
);
#define makeSurfaceFilmModel(CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::SurfaceFilmModel<kinematicCloudType>, \
0 \
); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
SurfaceFilmModel<kinematicCloudType>, \
dictionary \
); \
}
#define makeSurfaceFilmModelType(SS, CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
\
SurfaceFilmModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \
#define makeSurfaceFilmModelType(SS, CloudType) \
\
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
Foam::SurfaceFilmModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

113
src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -31,60 +31,87 @@ License
#include "Dual.H"
#include "Moment.H"
// Scalar interpolation
defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::scalar>, 0);
namespace Foam
{
// Scalar interpolation
defineNamedTemplateTypeNameAndDebug(AveragingMethod<scalar>, 0);
defineTemplateRunTimeSelectionTable
(
AveragingMethod<scalar>,
AveragingMethod<Foam::scalar>,
dictionary
);
}
// Vector interpolation
defineNamedTemplateTypeNameAndDebug(AveragingMethod<vector>, 0);
// Vector interpolation
defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::vector>, 0);
namespace Foam
{
defineTemplateRunTimeSelectionTable
(
AveragingMethod<vector>,
Foam::AveragingMethod<Foam::vector>,
dictionary
);
namespace AveragingMethods
{
// Basic interpolation
defineNamedTemplateTypeNameAndDebug(Basic<scalar>, 0);
AveragingMethod<scalar>::
adddictionaryConstructorToTable<Basic<scalar> >
addBasicscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug(Basic<vector>, 0);
AveragingMethod<vector>::
adddictionaryConstructorToTable<Basic<vector> >
addBasicvectorConstructorToTable_;
// Dual interpolation
defineNamedTemplateTypeNameAndDebug(Dual<scalar>, 0);
AveragingMethod<scalar>::
adddictionaryConstructorToTable<Dual<scalar> >
addDualscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug(Dual<vector>, 0);
AveragingMethod<vector>::
adddictionaryConstructorToTable<Dual<vector> >
addDualvectorConstructorToTable_;
// Moment interpolation
defineNamedTemplateTypeNameAndDebug(Moment<scalar>, 0);
AveragingMethod<scalar>::
adddictionaryConstructorToTable<Moment<scalar> >
addMomentscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug(Moment<vector>, 0);
AveragingMethod<vector>::
adddictionaryConstructorToTable<Moment<vector> >
addMomentvectorConstructorToTable_;
}
}
// Basic interpolation
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Basic<Foam::scalar>,
0
);
Foam::AveragingMethod<Foam::scalar>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::scalar> >
addBasicscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Basic<Foam::vector>,
0
);
Foam::AveragingMethod<Foam::vector>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::vector> >
addBasicvectorConstructorToTable_;
// Dual interpolation
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Dual<Foam::scalar>,
0
);
Foam::AveragingMethod<Foam::scalar>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::scalar> >
addDualscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Dual<Foam::vector>,
0
);
Foam::AveragingMethod<Foam::vector>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::vector> >
addDualvectorConstructorToTable_;
// Moment interpolation
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Moment<Foam::scalar>,
0
);
Foam::AveragingMethod<Foam::scalar>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::scalar> >
addMomentscalarConstructorToTable_;
defineNamedTemplateTypeNameAndDebug
(
Foam::AveragingMethods::Moment<Foam::vector>,
0
);
Foam::AveragingMethod<Foam::vector>::
adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::vector> >
addMomentvectorConstructorToTable_;
// ************************************************************************* //

30
src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -137,26 +137,32 @@ public:
#define makeDampingModel(CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DampingModel<MPPICCloudType>, \
Foam::DampingModel<MPPICCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
DampingModel<MPPICCloudType>, \
dictionary \
);
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
DampingModel<MPPICCloudType>, \
dictionary \
); \
}
#define makeDampingModelType(SS, CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
(Foam::DampingModels::SS<MPPICCloudType>, 0); \
\
DampingModel<MPPICCloudType>:: \
adddictionaryConstructorToTable<SS<MPPICCloudType> > \
Foam::DampingModel<MPPICCloudType>:: \
adddictionaryConstructorToTable \
<Foam::DampingModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;

48
src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -129,28 +129,34 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeIsotropyModel(CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
IsotropyModel<MPPICCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
IsotropyModel<MPPICCloudType>, \
dictionary \
);
#define makeIsotropyModel(CloudType) \
\
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::IsotropyModel<MPPICCloudType>, \
0 \
); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
IsotropyModel<MPPICCloudType>, \
dictionary \
); \
}
#define makeIsotropyModelType(SS, CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
\
IsotropyModel<MPPICCloudType>:: \
adddictionaryConstructorToTable<SS<MPPICCloudType> > \
#define makeIsotropyModelType(SS, CloudType) \
\
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
(Foam::IsotropyModels::SS<MPPICCloudType>, 0); \
\
Foam::IsotropyModel<MPPICCloudType>:: \
adddictionaryConstructorToTable \
<Foam::IsotropyModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;

48
src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -140,28 +140,34 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makePackingModel(CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
PackingModel<MPPICCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
PackingModel<MPPICCloudType>, \
dictionary \
);
#define makePackingModel(CloudType) \
\
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::PackingModel<MPPICCloudType>, \
0 \
); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
PackingModel<MPPICCloudType>, \
dictionary \
); \
}
#define makePackingModelType(SS, CloudType) \
\
typedef CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
\
PackingModel<MPPICCloudType>:: \
adddictionaryConstructorToTable<SS<MPPICCloudType> > \
#define makePackingModelType(SS, CloudType) \
\
typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
(Foam::PackingModels::SS<MPPICCloudType>, 0); \
\
Foam::PackingModel<MPPICCloudType>:: \
adddictionaryConstructorToTable \
<Foam::PackingModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -283,26 +283,29 @@ public:
#define makeCompositionModel(CloudType) \
\
typedef CloudType::reactingCloudType reactingCloudType; \
typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
CompositionModel<reactingCloudType>, \
Foam::CompositionModel<reactingCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
CompositionModel<reactingCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
CompositionModel<reactingCloudType>, \
dictionary \
); \
}
#define makeCompositionModelType(SS, CloudType) \
\
typedef CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\
CompositionModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<reactingCloudType> > \
Foam::CompositionModel<reactingCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -209,26 +209,29 @@ public:
#define makePhaseChangeModel(CloudType) \
\
typedef CloudType::reactingCloudType reactingCloudType; \
typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
PhaseChangeModel<reactingCloudType>, \
Foam::PhaseChangeModel<reactingCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
PhaseChangeModel<reactingCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
PhaseChangeModel<reactingCloudType>, \
dictionary \
); \
}
#define makePhaseChangeModelType(SS, CloudType) \
\
typedef CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\
PhaseChangeModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<reactingCloudType> > \
Foam::PhaseChangeModel<reactingCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -156,28 +156,33 @@ public:
#define makeDevolatilisationModel(CloudType) \
\
typedef CloudType::reactingMultiphaseCloudType \
typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DevolatilisationModel<reactingMultiphaseCloudType>, \
Foam::DevolatilisationModel<reactingMultiphaseCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
DevolatilisationModel<reactingMultiphaseCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
DevolatilisationModel<reactingMultiphaseCloudType>, \
dictionary \
); \
}
#define makeDevolatilisationModelType(SS, CloudType) \
\
typedef CloudType::reactingMultiphaseCloudType \
typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
defineNamedTemplateTypeNameAndDebug \
(Foam::SS<reactingMultiphaseCloudType>, 0); \
\
DevolatilisationModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
Foam::DevolatilisationModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable \
<Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -166,28 +166,33 @@ public:
#define makeSurfaceReactionModel(CloudType) \
\
typedef CloudType::reactingMultiphaseCloudType \
typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \
Foam::SurfaceReactionModel<reactingMultiphaseCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \
dictionary \
); \
}
#define makeSurfaceReactionModelType(SS, CloudType) \
\
typedef CloudType::reactingMultiphaseCloudType \
typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
defineNamedTemplateTypeNameAndDebug \
(Foam::SS<reactingMultiphaseCloudType>, 0); \
\
SurfaceReactionModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
Foam::SurfaceReactionModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable \
<Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;

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

@ -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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -155,26 +155,29 @@ public:
#define makeHeatTransferModel(CloudType) \
\
typedef CloudType::thermoCloudType thermoCloudType; \
typedef Foam::CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
HeatTransferModel<thermoCloudType>, \
Foam::HeatTransferModel<thermoCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
HeatTransferModel<thermoCloudType>, \
dictionary \
);
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
HeatTransferModel<thermoCloudType>, \
dictionary \
); \
}
#define makeHeatTransferModelType(SS, CloudType) \
\
typedef CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<thermoCloudType>, 0); \
typedef Foam::CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0); \
\
HeatTransferModel<thermoCloudType>:: \
adddictionaryConstructorToTable<SS<thermoCloudType> > \
Foam::HeatTransferModel<thermoCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<thermoCloudType> > \
add##SS##CloudType##thermoCloudType##ConstructorToTable_;

41
src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C
View File

@ -51,32 +51,29 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelCloudFunctionObjects(basicSprayCloud);
makeParcelCloudFunctionObjects(basicSprayCloud);
// Kinematic sub-models
makeThermoParcelForces(basicSprayCloud);
makeThermoParcelTurbulenceForces(basicSprayCloud);
makeParcelDispersionModels(basicSprayCloud);
makeParcelTurbulenceDispersionModels(basicSprayCloud);
makeSprayParcelInjectionModels(basicSprayCloud);
makeParcelPatchInteractionModels(basicSprayCloud);
makeSprayParcelStochasticCollisionModels(basicSprayCloud);
// Kinematic sub-models
makeThermoParcelForces(basicSprayCloud);
makeThermoParcelTurbulenceForces(basicSprayCloud);
makeParcelDispersionModels(basicSprayCloud);
makeParcelTurbulenceDispersionModels(basicSprayCloud);
makeSprayParcelInjectionModels(basicSprayCloud);
makeParcelPatchInteractionModels(basicSprayCloud);
makeSprayParcelStochasticCollisionModels(basicSprayCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicSprayCloud);
// Thermo sub-models
makeParcelHeatTransferModels(basicSprayCloud);
// Reacting sub-models
makeReactingParcelCompositionModels(basicSprayCloud);
makeReactingParcelPhaseChangeModels(basicSprayCloud);
makeReactingParcelSurfaceFilmModels(basicSprayCloud);
// Reacting sub-models
makeReactingParcelCompositionModels(basicSprayCloud);
makeReactingParcelPhaseChangeModels(basicSprayCloud);
makeReactingParcelSurfaceFilmModels(basicSprayCloud);
// Spray sub-models
makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud);
makeSprayParcelAtomizationModels(basicSprayCloud);
makeSprayParcelBreakupModels(basicSprayCloud);
};
// Spray sub-models
makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud);
makeSprayParcelAtomizationModels(basicSprayCloud);
makeSprayParcelBreakupModels(basicSprayCloud);
// ************************************************************************* //

26
src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
View File

@ -152,26 +152,30 @@ public:
#define makeAtomizationModel(CloudType) \
\
typedef CloudType::sprayCloudType sprayCloudType; \
typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
AtomizationModel<sprayCloudType>, \
Foam::AtomizationModel<sprayCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
AtomizationModel<sprayCloudType>, \
dictionary \
);
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
AtomizationModel<sprayCloudType>, \
dictionary \
); \
}
#define makeAtomizationModelType(SS, CloudType) \
\
typedef CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<sprayCloudType>, 0); \
typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0); \
\
AtomizationModel<sprayCloudType>:: \
adddictionaryConstructorToTable<SS<sprayCloudType> > \
Foam::AtomizationModel<sprayCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<sprayCloudType> > \
add##SS##CloudType##sprayCloudType##ConstructorToTable_;

26
src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
View File

@ -199,26 +199,30 @@ public:
#define makeBreakupModel(CloudType) \
\
typedef CloudType::sprayCloudType sprayCloudType; \
typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
BreakupModel<sprayCloudType>, \
Foam::BreakupModel<sprayCloudType>, \
0 \
); \
defineTemplateRunTimeSelectionTable \
( \
BreakupModel<sprayCloudType>, \
dictionary \
);
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \
( \
BreakupModel<sprayCloudType>, \
dictionary \
); \
}
#define makeBreakupModelType(SS, CloudType) \
\
typedef CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<sprayCloudType>, 0); \
typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0); \
\
BreakupModel<sprayCloudType>:: \
adddictionaryConstructorToTable<SS<sprayCloudType> > \
Foam::BreakupModel<sprayCloudType>:: \
adddictionaryConstructorToTable<Foam::SS<sprayCloudType> > \
add##SS##CloudType##sprayCloudType##ConstructorToTable_;

4
src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
View File

@ -35,10 +35,10 @@ License
#define makeParcelTurbulenceDispersionModels(CloudType) \
\
typedef CloudType::kinematicCloudType kinematicCloudType; \
typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
DispersionRASModel<kinematicCloudType>, \
Foam::DispersionRASModel<kinematicCloudType>, \
0 \
); \
\

11
src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C
View File

@ -28,20 +28,9 @@ License
#include "makeSootTypes.H"
#include "thermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace radiation
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makeSootTypesThermo(mixtureFractionSoot, gasHThermoPhysics);
makeSootTypesThermo(mixtureFractionSoot, gasEThermoPhysics);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
} // End namespace radiation
// ************************************************************************* //

24
src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
View File

@ -32,8 +32,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSootTypesThermo(sootModelType, Thermo) \
\
typedef sootModelType<Thermo> sootModelType##Thermo; \
typedef Foam::radiation::sootModelType<Foam::Thermo> \
sootModelType##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
@ -42,12 +42,20 @@ License
0 \
); \
\
addToRunTimeSelectionTable \
( \
sootModel, \
sootModelType##Thermo, \
dictionary \
);
namespace Foam \
{ \
namespace radiation \
{ \
typedef sootModelType<Thermo> sootModelType##Thermo; \
\
addToRunTimeSelectionTable \
( \
sootModel, \
sootModelType##Thermo, \
dictionary \
); \
} \
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

54
src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,34 +40,32 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hConstSolidThermoPhysics,
gasHThermoPhysics
);
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hConstSolidThermoPhysics,
gasHThermoPhysics
);
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hExponentialSolidThermoPhysics,
gasHThermoPhysics
);
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hExponentialSolidThermoPhysics,
gasHThermoPhysics
);
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hExpKappaConstSolidThermoPhysics,
gasHThermoPhysics
);
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hExpKappaConstSolidThermoPhysics,
gasHThermoPhysics
);
}
// ************************************************************************* //

27
src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,43 +29,36 @@ Description
#ifndef makeSolidChemistryModel_H
#define makeSolidChemistryModel_H
#include "addToRunTimeSelectionTable.H"
#include "solidChemistryModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo, GThermo) \
\
typedef SS<Comp, SThermo, GThermo> SS##Comp##SThermo##GThermo; \
typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo> \
SS##Comp##SThermo##GThermo; \
\
typedef sChemistry<Comp, SThermo> sChemistryl##Comp##SThermo; \
typedef Foam::sChemistry<Foam::Comp, Foam::SThermo> \
sChemistryl##Comp##SThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
sChemistryl##Comp##SThermo, \
(word(sChemistry::typeName_()) + "<"#Comp"," + SThermo::typeName() + \
+ ">").c_str(), \
(Foam::word(sChemistryl##Comp##SThermo::typeName_()) + "<"#Comp"," \
+ SThermo::typeName() + ">").c_str(), \
0 \
); \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##SThermo##GThermo, \
(word(SS::typeName_()) + "<"#Comp"," + SThermo::typeName() + "," + \
GThermo::typeName() + ">").c_str(), \
(Foam::word(SS##Comp##SThermo##GThermo::typeName_()) + "<"#Comp"," \
+ SThermo::typeName() + "," + GThermo::typeName() + ">").c_str(), \
0 \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

4
wmake/rules/linux64Clang/c++
View File

@ -1,10 +1,10 @@
SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
CC = clang++ -m64

4
wmake/rules/linuxClang/c++
View File

@ -1,10 +1,10 @@
SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
CC = clang++ -m32