zhyang-dev/OpenFOAM-5.x
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 0296a4ed9e
commit 2c25b8db52
94 changed files with 1203 additions and 1241 deletions
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,6 +40,46 @@ Description
// definitions (debug information only) // 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 the debug information, lookup as \a Name
#define registerDebugSwitchWithName(Type,Tag,Name) \ #define registerDebugSwitchWithName(Type,Tag,Name) \
class add##Tag##ToDebug \ class add##Tag##ToDebug \
@ -135,11 +175,13 @@ Description
//- Define the debug information for templates, lookup as \a Name //- Define the debug information for templates, lookup as \a Name
# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \ # define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \ 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 the debug information for templates sub-classes, lookup as \a Name
# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \ # define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \ template<> \
defineDebugSwitchWithName(Type, Name, DebugSwitch) defineDebugSwitchWithName(Type, Name, DebugSwitch); \
registerTemplateDebugSwitchWithName(Type, Name)
#endif #endif
//- Define the debug information for templates //- Define the debug information for templates

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

@ -27,43 +27,39 @@ License
#include "addToRunTimeSelectionTable.H" #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 Foam
{ {
namespace compressible namespace compressible
{ {
addToPatchFieldRunTimeSelection
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // (
defineTemplateTypeNameAndDebugWithName
(
constSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hConstSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField, fvPatchScalarField,
constSolid_thermalBaffle1DFvPatchScalarField constSolid_thermalBaffle1DFvPatchScalarField
); );
defineTemplateTypeNameAndDebugWithName addToPatchFieldRunTimeSelection
( (
expoSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hExponentialSolidThermoPhysics>",
0
);
addToPatchFieldRunTimeSelection
(
fvPatchScalarField, fvPatchScalarField,
expoSolid_thermalBaffle1DFvPatchScalarField 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) \ #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 Foam \
{ \ { \
namespace SType##Models \ namespace SType##Models \
{ \ { \
typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel; \ typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel; \
\ \
defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
\
addToRunTimeSelectionTable \ addToRunTimeSelectionTable \
( \ ( \
SType##BaseModel, \ SType##BaseModel, \

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,7 +32,9 @@ License
#define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \ #define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \
\ \
typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \ typedef Foam::combustionModels::CombModel \
<Foam::combustionModels::CombType, Foam::Thermo> \
CombModel##CombType##Thermo; \
\ \
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \ ( \
@ -41,17 +43,26 @@ License
0 \ 0 \
); \ ); \
\ \
namespace Foam \
{ \
namespace combustionModels \
{ \
typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \
addToRunTimeSelectionTable \ addToRunTimeSelectionTable \
( \ ( \
Table, \ Table, \
CombModel##CombType##Thermo, \ CombModel##CombType##Thermo, \
dictionary \ dictionary \
); ); \
} \
}
#define makeCombustionTypes(CombModel, CombType, Table) \ #define makeCombustionTypes(CombModel, CombType, Table) \
\ \
typedef CombModel<CombType> CombModel##CombType; \ typedef Foam::combustionModels::CombModel \
<Foam::combustionModels::CombType> \
CombModel##CombType; \
\ \
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \ ( \
@ -60,13 +71,20 @@ License
0 \ 0 \
); \ ); \
\ \
namespace Foam \
{ \
namespace combustionModels \
{ \
typedef CombModel<CombType> CombModel##CombType; \
\
addToRunTimeSelectionTable \ addToRunTimeSelectionTable \
( \ ( \
Table, \ Table, \
CombModel##CombType, \ CombModel##CombType, \
dictionary \ dictionary \
); ); \
} \
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

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

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -204,12 +204,16 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFvConvectionTypeScheme(SS, Type) \ #define makeFvConvectionTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##IstreamConstructorToTable_; { \
convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvConvectionScheme(SS) \ #define makeFvConvectionScheme(SS) \
\ \
@ -221,11 +225,17 @@ makeFvConvectionTypeScheme(SS, tensor)
#define makeMultivariateFvConvectionTypeScheme(SS, Type) \ #define makeMultivariateFvConvectionTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
convectionScheme<Type>::addMultivariateConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##MultivariateConstructorToTable_; { \
convectionScheme<Type>:: \
addMultivariateConstructorToTable<SS<Type> > \
add##SS##Type##MultivariateConstructorToTable_; \
} \
}
#define makeMultivariateFvConvectionScheme(SS) \ #define makeMultivariateFvConvectionScheme(SS) \

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam int Foam::fv::warnUnboundedGauss
{ (
namespace fv
{
int warnUnboundedGauss
(
Foam::debug::debugSwitch("warnUnboundedGauss", true) 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
{
namespace fv
{
makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
}
}
// ************************************************************************* // // ************************************************************************* //

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -181,12 +181,16 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFvD2dt2TypeScheme(SS, Type) \ #define makeFvD2dt2TypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##IstreamConstructorToTable_; { \
d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvD2dt2Scheme(SS) \ #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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
{
namespace fv
{
makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
}
}
// ************************************************************************* // // ************************************************************************* //

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -165,12 +165,16 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFvDivTypeScheme(SS, Type) \ #define makeFvDivTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##IstreamConstructorToTable_; { \
divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvDivScheme(SS) \ #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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvDivScheme(gaussDivScheme)
{
namespace fv
{
makeFvDivScheme(gaussDivScheme)
}
}
// ************************************************************************* // // ************************************************************************* //

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFvGradTypeScheme(SS, Type) \ #define makeFvGradTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##IstreamConstructorToTable_; { \
gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
add##SS##Type##IstreamConstructorToTable_; \
} \
}
#define makeFvGradScheme(SS) \ #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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvGradScheme(leastSquaresGrad)
{
namespace fv
{
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,13 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvGradScheme(cellLimitedGrad)
{
namespace fv
{
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvGradScheme(cellMDLimitedGrad)
{
namespace fv
{
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvGradScheme(faceLimitedGrad)
{
namespace fv
{
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,13 +34,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvGradScheme(faceMDLimitedGrad)
{
namespace fv
{
makeFvGradScheme(faceMDLimitedGrad)
}
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvLaplacianScheme(gaussLaplacianScheme)
{
namespace fv
{
makeFvLaplacianScheme(gaussLaplacianScheme)
}
}
#define declareFvmLaplacianScalarGamma(Type) \ #define declareFvmLaplacianScalarGamma(Type) \
\ \

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -212,13 +212,20 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFvLaplacianTypeScheme(SS, GType, Type) \ #define makeFvLaplacianTypeScheme(SS, GType, Type) \
\ typedef Foam::fv::SS<Foam::Type, Foam::GType> SS##Type##GType; \
typedef SS<Type, GType> SS##Type##GType; \
defineNamedTemplateTypeNameAndDebug(SS##Type##GType, 0); \ defineNamedTemplateTypeNameAndDebug(SS##Type##GType, 0); \
\ \
namespace Foam \
{ \
namespace fv \
{ \
typedef SS<Type, GType> SS##Type##GType; \
\
laplacianScheme<Type, GType>:: \ laplacianScheme<Type, GType>:: \
addIstreamConstructorToTable<SS<Type, GType> > \ addIstreamConstructorToTable<SS<Type, GType> > \
add##SS##Type##GType##IstreamConstructorToTable_; add##SS##Type##GType##IstreamConstructorToTable_; \
} \
}
#define makeFvLaplacianScheme(SS) \ #define makeFvLaplacianScheme(SS) \

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -157,23 +157,30 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \ #define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
\ typedef Foam::fv::CentredFitSnGradScheme \
typedef CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> \ <Foam::TYPE, Foam::POLYNOMIAL, Foam::STENCIL> \
CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \ CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \
defineTemplateTypeNameAndDebugWithName \ \
defineTemplateTypeNameAndDebugWithName \
(CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \ (CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \
\ \
snGradScheme<TYPE>::addMeshConstructorToTable \ namespace Foam \
<CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \ { \
add##SS##STENCIL##TYPE##MeshConstructorToTable_; namespace fv \
{ \
snGradScheme<TYPE>::addMeshConstructorToTable \
<CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \
add##SS##STENCIL##TYPE##MeshConstructorToTable_; \
} \
}
#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \ #define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \
\ \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor) 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,14 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeSnGradScheme(correctedSnGrad)
{
namespace fv
{
makeSnGradScheme(correctedSnGrad)
}
}
template<> template<>
Foam::tmp<Foam::surfaceScalarField> 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeSnGradScheme(faceCorrectedSnGrad)
{
namespace fv
{
makeSnGradScheme(faceCorrectedSnGrad)
}
}
template<> template<>

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

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeSnGradTypeScheme(SS, Type) \ #define makeSnGradTypeScheme(SS, Type) \
defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\ \
defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \ namespace Foam \
\ { \
snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \ namespace fv \
add##SS##Type##MeshConstructorToTable_; { \
snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \
add##SS##Type##MeshConstructorToTable_; \
} \
}
#define makeSnGradScheme(SS) \ #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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,12 +31,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeSnGradScheme(uncorrectedSnGrad)
{
namespace fv
{
makeSnGradScheme(uncorrectedSnGrad)
}
}
// ************************************************************************* // // ************************************************************************* //

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvOption(ExplicitSetValue, scalar);
{ makeFvOption(ExplicitSetValue, vector);
namespace fv makeFvOption(ExplicitSetValue, sphericalTensor);
{ makeFvOption(ExplicitSetValue, symmTensor);
makeFvOption(ExplicitSetValue, scalar); makeFvOption(ExplicitSetValue, tensor);
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,12 +35,13 @@ License
\ \
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \ ( \
Option<Type>, \ Foam::fv::Option<Foam::Type>, \
#Type#Option, \ #Type#Option, \
0 \ 0 \
); \ ); \
\ \
option::adddictionaryConstructorToTable<Option<Type> > \ Foam::fv::option::adddictionaryConstructorToTable \
<Foam::fv::Option<Foam::Type> > \
add##Option##Type##dictionary##ConstructorTooptionTable_ 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvOption(CodedSource, scalar);
{ makeFvOption(CodedSource, vector);
namespace fv makeFvOption(CodedSource, sphericalTensor);
{ makeFvOption(CodedSource, symmTensor);
makeFvOption(CodedSource, scalar); makeFvOption(CodedSource, tensor);
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeFvOption(SemiImplicitSource, scalar);
{ makeFvOption(SemiImplicitSource, vector);
namespace fv makeFvOption(SemiImplicitSource, sphericalTensor);
{ makeFvOption(SemiImplicitSource, symmTensor);
makeFvOption(SemiImplicitSource, scalar); makeFvOption(SemiImplicitSource, tensor);
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) \ #define makeParcelTurbulenceDispersionModels(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
DispersionRASModel<kinematicCloudType>, \ Foam::DispersionRASModel<kinematicCloudType>, \
0 \ 0 \
); \ ); \
\ \

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,41 +48,38 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
{
makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(basicReactingMultiphaseCloud); makeThermoParcelForces(basicReactingMultiphaseCloud);
makeParcelDispersionModels(basicReactingMultiphaseCloud); makeParcelDispersionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud); makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
makeParcelPatchInteractionModels(basicReactingMultiphaseCloud); makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
makeReactingMultiphaseParcelStochasticCollisionModels makeReactingMultiphaseParcelStochasticCollisionModels
( (
basicReactingMultiphaseCloud basicReactingMultiphaseCloud
); );
makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud); makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicReactingMultiphaseCloud); makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
// Reacting sub-models // Reacting sub-models
makeReactingMultiphaseParcelCompositionModels makeReactingMultiphaseParcelCompositionModels
( (
basicReactingMultiphaseCloud basicReactingMultiphaseCloud
); );
makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud); makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
// Reacting multiphase sub-models // Reacting multiphase sub-models
makeReactingMultiphaseParcelDevolatilisationModels makeReactingMultiphaseParcelDevolatilisationModels
( (
basicReactingMultiphaseCloud basicReactingMultiphaseCloud
); );
makeReactingMultiphaseParcelSurfaceReactionModels makeReactingMultiphaseParcelSurfaceReactionModels
( (
basicReactingMultiphaseCloud basicReactingMultiphaseCloud
); );
}
// ************************************************************************* // // ************************************************************************* //

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,25 +44,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeParcelCloudFunctionObjects(basicReactingCloud);
{
makeParcelCloudFunctionObjects(basicReactingCloud);
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(basicReactingCloud); makeThermoParcelForces(basicReactingCloud);
makeParcelDispersionModels(basicReactingCloud); makeParcelDispersionModels(basicReactingCloud);
makeReactingParcelInjectionModels(basicReactingCloud); makeReactingParcelInjectionModels(basicReactingCloud);
makeParcelPatchInteractionModels(basicReactingCloud); makeParcelPatchInteractionModels(basicReactingCloud);
makeParcelStochasticCollisionModels(basicReactingCloud); makeParcelStochasticCollisionModels(basicReactingCloud);
makeReactingParcelSurfaceFilmModels(basicReactingCloud); makeReactingParcelSurfaceFilmModels(basicReactingCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicReactingCloud); makeParcelHeatTransferModels(basicReactingCloud);
// Reacting sub-models // Reacting sub-models
makeReactingParcelCompositionModels(basicReactingCloud); makeReactingParcelCompositionModels(basicReactingCloud);
makeReactingParcelPhaseChangeModels(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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,21 +40,18 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam makeParcelCloudFunctionObjects(basicThermoCloud);
{
makeParcelCloudFunctionObjects(basicThermoCloud);
// Kinematic sub-models // Kinematic sub-models
makeThermoParcelForces(basicThermoCloud); makeThermoParcelForces(basicThermoCloud);
makeParcelDispersionModels(basicThermoCloud); makeParcelDispersionModels(basicThermoCloud);
makeParcelInjectionModels(basicThermoCloud); makeParcelInjectionModels(basicThermoCloud);
makeParcelPatchInteractionModels(basicThermoCloud); makeParcelPatchInteractionModels(basicThermoCloud);
makeParcelStochasticCollisionModels(basicThermoCloud); makeParcelStochasticCollisionModels(basicThermoCloud);
makeParcelSurfaceFilmModels(basicThermoCloud); makeParcelSurfaceFilmModels(basicThermoCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicThermoCloud); makeParcelHeatTransferModels(basicThermoCloud);
}
// ************************************************************************* // // ************************************************************************* //

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -141,26 +141,29 @@ public:
#define makeCollisionModel(CloudType) \ #define makeCollisionModel(CloudType) \
\ \
typedef CloudType::collidingCloudType collidingCloudType; \ typedef Foam::CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
CollisionModel<collidingCloudType>, \ Foam::CollisionModel<collidingCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
CollisionModel<collidingCloudType>, \ CollisionModel<collidingCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeCollisionModelType(SS, CloudType) \ #define makeCollisionModelType(SS, CloudType) \
\ \
typedef CloudType::collidingCloudType collidingCloudType; \ typedef Foam::CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<collidingCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0); \
\ \
CollisionModel<collidingCloudType>:: \ Foam::CollisionModel<collidingCloudType>:: \
adddictionaryConstructorToTable<SS<collidingCloudType> > \ adddictionaryConstructorToTable<Foam::SS<collidingCloudType> > \
add##SS##CloudType##collidingCloudType##ConstructorToTable_; add##SS##CloudType##collidingCloudType##ConstructorToTable_;

16
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -146,20 +146,24 @@ public:
#define makePairModel(CloudType) \ #define makePairModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(PairModel<CloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::PairModel<Foam::CloudType>, 0); \
\ \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PairModel<CloudType>, \ PairModel<Foam::CloudType>, \
dictionary \ dictionary \
); ); \
}
#define makePairModelType(SS, CloudType) \ #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_; add##SS##CloudType##ConstructorToTable_;

16
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -156,20 +156,24 @@ public:
#define makeWallModel(CloudType) \ #define makeWallModel(CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(WallModel<CloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::WallModel<Foam::CloudType>, 0); \
\ \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
WallModel<CloudType>, \ WallModel<Foam::CloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeWallModelType(SS, CloudType) \ #define makeWallModelType(SS, CloudType) \
\ \
defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0); \
\ \
WallModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \ Foam::WallModel<Foam::CloudType>:: \
adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> > \
add##SS##CloudType##ConstructorToTable_; add##SS##CloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -132,22 +132,26 @@ public:
#define makeDispersionModel(CloudType) \ #define makeDispersionModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineTemplateTypeNameAndDebug(DispersionModel<kinematicCloudType>, 0); \ defineTemplateTypeNameAndDebug \
(Foam::DispersionModel<kinematicCloudType>, 0); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
DispersionModel<kinematicCloudType>, \ DispersionModel<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeDispersionModelType(SS, CloudType) \ #define makeDispersionModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
DispersionModel<kinematicCloudType>:: \ Foam::DispersionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -357,26 +357,30 @@ public:
#define makeInjectionModel(CloudType) \ #define makeInjectionModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
InjectionModel<kinematicCloudType>, \ Foam::InjectionModel<kinematicCloudType>, \
0 \ 0 \
); \ ); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
InjectionModel<kinematicCloudType>, \ InjectionModel<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeInjectionModelType(SS, CloudType) \ #define makeInjectionModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
InjectionModel<kinematicCloudType>:: \ Foam::InjectionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -195,22 +195,27 @@ public:
#define makeParticleForceModel(CloudType) \ #define makeParticleForceModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(ParticleForce<kinematicCloudType>, 0);\ defineNamedTemplateTypeNameAndDebug \
(Foam::ParticleForce<kinematicCloudType>, 0); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
ParticleForce<kinematicCloudType>, \ ParticleForce<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeParticleForceModelType(SS, CloudType) \ #define makeParticleForceModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
ParticleForce<kinematicCloudType>:: \ Foam::ParticleForce<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -174,26 +174,30 @@ public:
#define makePatchInteractionModel(CloudType) \ #define makePatchInteractionModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
PatchInteractionModel<kinematicCloudType>, \ Foam::PatchInteractionModel<kinematicCloudType>, \
0 \ 0 \
); \ ); \
\
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PatchInteractionModel<kinematicCloudType>, \ PatchInteractionModel<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makePatchInteractionModelType(SS, CloudType) \ #define makePatchInteractionModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
PatchInteractionModel<kinematicCloudType>:: \ Foam::PatchInteractionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -133,26 +133,29 @@ public:
#define makeStochasticCollisionModel(CloudType) \ #define makeStochasticCollisionModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
StochasticCollisionModel<kinematicCloudType>, \ Foam::StochasticCollisionModel<kinematicCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
StochasticCollisionModel<kinematicCloudType>, \ StochasticCollisionModel<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeStochasticCollisionModelType(SS, CloudType) \ #define makeStochasticCollisionModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
StochasticCollisionModel<kinematicCloudType>:: \ Foam::StochasticCollisionModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; add##SS##CloudType##kinematicCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -237,26 +237,29 @@ public:
#define makeSurfaceFilmModel(CloudType) \ #define makeSurfaceFilmModel(CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
SurfaceFilmModel<kinematicCloudType>, \ Foam::SurfaceFilmModel<kinematicCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
SurfaceFilmModel<kinematicCloudType>, \ SurfaceFilmModel<kinematicCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeSurfaceFilmModelType(SS, CloudType) \ #define makeSurfaceFilmModelType(SS, CloudType) \
\ \
typedef CloudType::kinematicCloudType kinematicCloudType; \ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\ \
SurfaceFilmModel<kinematicCloudType>:: \ Foam::SurfaceFilmModel<kinematicCloudType>:: \
adddictionaryConstructorToTable<SS<kinematicCloudType> > \ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_; 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,60 +31,87 @@ License
#include "Dual.H" #include "Dual.H"
#include "Moment.H" #include "Moment.H"
// Scalar interpolation
defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::scalar>, 0);
namespace Foam namespace Foam
{ {
// Scalar interpolation
defineNamedTemplateTypeNameAndDebug(AveragingMethod<scalar>, 0);
defineTemplateRunTimeSelectionTable defineTemplateRunTimeSelectionTable
( (
AveragingMethod<scalar>, AveragingMethod<Foam::scalar>,
dictionary dictionary
); );
}
// Vector interpolation // Vector interpolation
defineNamedTemplateTypeNameAndDebug(AveragingMethod<vector>, 0); defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::vector>, 0);
namespace Foam
{
defineTemplateRunTimeSelectionTable defineTemplateRunTimeSelectionTable
( (
AveragingMethod<vector>, Foam::AveragingMethod<Foam::vector>,
dictionary 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_;
// ************************************************************************* // // ************************************************************************* //

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -283,26 +283,29 @@ public:
#define makeCompositionModel(CloudType) \ #define makeCompositionModel(CloudType) \
\ \
typedef CloudType::reactingCloudType reactingCloudType; \ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
CompositionModel<reactingCloudType>, \ Foam::CompositionModel<reactingCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
CompositionModel<reactingCloudType>, \ CompositionModel<reactingCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeCompositionModelType(SS, CloudType) \ #define makeCompositionModelType(SS, CloudType) \
\ \
typedef CloudType::reactingCloudType reactingCloudType; \ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\ \
CompositionModel<reactingCloudType>:: \ Foam::CompositionModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<reactingCloudType> > \ adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_; add##SS##CloudType##reactingCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -209,26 +209,29 @@ public:
#define makePhaseChangeModel(CloudType) \ #define makePhaseChangeModel(CloudType) \
\ \
typedef CloudType::reactingCloudType reactingCloudType; \ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
PhaseChangeModel<reactingCloudType>, \ Foam::PhaseChangeModel<reactingCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
PhaseChangeModel<reactingCloudType>, \ PhaseChangeModel<reactingCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makePhaseChangeModelType(SS, CloudType) \ #define makePhaseChangeModelType(SS, CloudType) \
\ \
typedef CloudType::reactingCloudType reactingCloudType; \ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\ \
PhaseChangeModel<reactingCloudType>:: \ Foam::PhaseChangeModel<reactingCloudType>:: \
adddictionaryConstructorToTable<SS<reactingCloudType> > \ adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_; add##SS##CloudType##reactingCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -156,28 +156,33 @@ public:
#define makeDevolatilisationModel(CloudType) \ #define makeDevolatilisationModel(CloudType) \
\ \
typedef CloudType::reactingMultiphaseCloudType \ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
DevolatilisationModel<reactingMultiphaseCloudType>, \ Foam::DevolatilisationModel<reactingMultiphaseCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
DevolatilisationModel<reactingMultiphaseCloudType>, \ DevolatilisationModel<reactingMultiphaseCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeDevolatilisationModelType(SS, CloudType) \ #define makeDevolatilisationModelType(SS, CloudType) \
\ \
typedef CloudType::reactingMultiphaseCloudType \ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug \
(Foam::SS<reactingMultiphaseCloudType>, 0); \
\ \
DevolatilisationModel<reactingMultiphaseCloudType>:: \ Foam::DevolatilisationModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \ adddictionaryConstructorToTable \
<Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_; add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -166,28 +166,33 @@ public:
#define makeSurfaceReactionModel(CloudType) \ #define makeSurfaceReactionModel(CloudType) \
\ \
typedef CloudType::reactingMultiphaseCloudType \ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \ Foam::SurfaceReactionModel<reactingMultiphaseCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
SurfaceReactionModel<reactingMultiphaseCloudType>, \ SurfaceReactionModel<reactingMultiphaseCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeSurfaceReactionModelType(SS, CloudType) \ #define makeSurfaceReactionModelType(SS, CloudType) \
\ \
typedef CloudType::reactingMultiphaseCloudType \ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \ reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug \
(Foam::SS<reactingMultiphaseCloudType>, 0); \
\ \
SurfaceReactionModel<reactingMultiphaseCloudType>:: \ Foam::SurfaceReactionModel<reactingMultiphaseCloudType>:: \
adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \ adddictionaryConstructorToTable \
<Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_; add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;

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

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -155,26 +155,29 @@ public:
#define makeHeatTransferModel(CloudType) \ #define makeHeatTransferModel(CloudType) \
\ \
typedef CloudType::thermoCloudType thermoCloudType; \ typedef Foam::CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug \ defineNamedTemplateTypeNameAndDebug \
( \ ( \
HeatTransferModel<thermoCloudType>, \ Foam::HeatTransferModel<thermoCloudType>, \
0 \ 0 \
); \ ); \
namespace Foam \
{ \
defineTemplateRunTimeSelectionTable \ defineTemplateRunTimeSelectionTable \
( \ ( \
HeatTransferModel<thermoCloudType>, \ HeatTransferModel<thermoCloudType>, \
dictionary \ dictionary \
); ); \
}
#define makeHeatTransferModelType(SS, CloudType) \ #define makeHeatTransferModelType(SS, CloudType) \
\ \
typedef CloudType::thermoCloudType thermoCloudType; \ typedef Foam::CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug(SS<thermoCloudType>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0); \
\ \
HeatTransferModel<thermoCloudType>:: \ Foam::HeatTransferModel<thermoCloudType>:: \
adddictionaryConstructorToTable<SS<thermoCloudType> > \ adddictionaryConstructorToTable<Foam::SS<thermoCloudType> > \
add##SS##CloudType##thermoCloudType##ConstructorToTable_; 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 // Kinematic sub-models
makeThermoParcelForces(basicSprayCloud); makeThermoParcelForces(basicSprayCloud);
makeThermoParcelTurbulenceForces(basicSprayCloud); makeThermoParcelTurbulenceForces(basicSprayCloud);
makeParcelDispersionModels(basicSprayCloud); makeParcelDispersionModels(basicSprayCloud);
makeParcelTurbulenceDispersionModels(basicSprayCloud); makeParcelTurbulenceDispersionModels(basicSprayCloud);
makeSprayParcelInjectionModels(basicSprayCloud); makeSprayParcelInjectionModels(basicSprayCloud);
makeParcelPatchInteractionModels(basicSprayCloud); makeParcelPatchInteractionModels(basicSprayCloud);
makeSprayParcelStochasticCollisionModels(basicSprayCloud); makeSprayParcelStochasticCollisionModels(basicSprayCloud);
// Thermo sub-models // Thermo sub-models
makeParcelHeatTransferModels(basicSprayCloud); makeParcelHeatTransferModels(basicSprayCloud);
// Reacting sub-models // Reacting sub-models
makeReactingParcelCompositionModels(basicSprayCloud); makeReactingParcelCompositionModels(basicSprayCloud);
makeReactingParcelPhaseChangeModels(basicSprayCloud); makeReactingParcelPhaseChangeModels(basicSprayCloud);
makeReactingParcelSurfaceFilmModels(basicSprayCloud); makeReactingParcelSurfaceFilmModels(basicSprayCloud);
// Spray sub-models // Spray sub-models
makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud); makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud);
makeSprayParcelAtomizationModels(basicSprayCloud); makeSprayParcelAtomizationModels(basicSprayCloud);
makeSprayParcelBreakupModels(basicSprayCloud); makeSprayParcelBreakupModels(basicSprayCloud);
};
// ************************************************************************* // // ************************************************************************* //

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,10 +1,10 @@
SUFFIXES += .C SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now # -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 # 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 CC = clang++ -m64

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

@ -1,10 +1,10 @@
SUFFIXES += .C SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now # -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 # 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 CC = clang++ -m32