diff --git a/src/OpenFOAM/db/typeInfo/debugName.H b/src/OpenFOAM/db/typeInfo/debugName.H
index 2277945ed4dcb2eb9eca8e984d03c064846806e7..86c3d669353dc7168d411f5d4890dc9a300f1294 100644
--- a/src/OpenFOAM/db/typeInfo/debugName.H
+++ b/src/OpenFOAM/db/typeInfo/debugName.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,6 +40,46 @@ Description
// definitions (debug information only)
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+namespace Foam
+{
+
+//- Define the debug information, lookup as \a Name
+template<class Type>
+class AddToDebug
+:
+ public ::Foam::simpleRegIOobject
+{
+public:
+
+ //- The unique AddToDebug object
+ static const AddToDebug addToDebug;
+
+ AddToDebug(const char* name)
+ :
+ ::Foam::simpleRegIOobject(Foam::debug::addDebugObject, name)
+ {}
+
+ virtual ~AddToDebug()
+ {}
+
+ virtual void readData(Foam::Istream& is)
+ {
+ Type::debug = readLabel(is);
+ }
+
+ virtual void writeData(Foam::Ostream& os) const
+ {
+ os << Type::debug;
+ }
+};
+
+} // End namespace Foam
+
+#define registerTemplateDebugSwitchWithName(Type,Name) \
+ template<> \
+ const Foam::AddToDebug<Type> Foam::AddToDebug<Type>::addToDebug(Name)
+
+
//- Define the debug information, lookup as \a Name
#define registerDebugSwitchWithName(Type,Tag,Name) \
class add##Tag##ToDebug \
@@ -135,11 +175,13 @@ Description
//- Define the debug information for templates, lookup as \a Name
# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \
- defineDebugSwitchWithName(Type, Name, DebugSwitch)
+ defineDebugSwitchWithName(Type, Name, DebugSwitch); \
+ registerTemplateDebugSwitchWithName(Type, Name)
//- Define the debug information for templates sub-classes, lookup as \a Name
# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \
- defineDebugSwitchWithName(Type, Name, DebugSwitch)
+ defineDebugSwitchWithName(Type, Name, DebugSwitch); \
+ registerTemplateDebugSwitchWithName(Type, Name)
#endif
//- Define the debug information for templates
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
index 8eab801324967faa7013e0d199d979aecfbf75f4..d84522096f3c44f60eddbe5d08398ae0efd302f9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
@@ -27,43 +27,39 @@ License
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTemplateTypeNameAndDebugWithName
(
- constSolid_thermalBaffle1DFvPatchScalarField,
+ Foam::compressible::constSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hConstSolidThermoPhysics>",
0
);
-addToPatchFieldRunTimeSelection
-(
- fvPatchScalarField,
- constSolid_thermalBaffle1DFvPatchScalarField
-);
-
defineTemplateTypeNameAndDebugWithName
(
- expoSolid_thermalBaffle1DFvPatchScalarField,
+ Foam::compressible::expoSolid_thermalBaffle1DFvPatchScalarField,
"compressible::thermalBaffle1D<hExponentialSolidThermoPhysics>",
0
);
-addToPatchFieldRunTimeSelection
-(
- fvPatchScalarField,
- expoSolid_thermalBaffle1DFvPatchScalarField
-);
+namespace Foam
+{
+namespace compressible
+{
+ addToPatchFieldRunTimeSelection
+ (
+ fvPatchScalarField,
+ constSolid_thermalBaffle1DFvPatchScalarField
+ );
+
+ addToPatchFieldRunTimeSelection
+ (
+ fvPatchScalarField,
+ expoSolid_thermalBaffle1DFvPatchScalarField
+ );
+}
+}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace compressible
-} // End namespace Foam
// ************************************************************************* //
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
index ae0b0cb5977a201f4cd233b4d2527022630a13ee..12839d7c6bc849b743d94b494b3c90bc89da0c4d 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H
@@ -90,14 +90,16 @@ License
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
+ typedef Foam::SType##Models::Type<Foam::eddyDiffusivity<Foam::BaseModel> > \
+ Type##SType##BaseModel; \
+ defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
+ \
namespace Foam \
{ \
namespace SType##Models \
{ \
typedef Type<eddyDiffusivity<BaseModel> > Type##SType##BaseModel; \
\
- defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
- \
addToRunTimeSelectionTable \
( \
SType##BaseModel, \
diff --git a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
index cea2079b454f52c277fa304294527957b9d06493..6088a71aff038a227cc0e8f1c62f8d635ffc9f56 100644
--- a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -88,14 +88,15 @@ License
#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::SType##Models::Type<Foam::BaseModel>, 0); \
+ \
namespace Foam \
{ \
namespace SType##Models \
{ \
typedef Type<BaseModel> Type##SType##BaseModel; \
\
- defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \
- \
addToRunTimeSelectionTable \
( \
SType##BaseModel, \
diff --git a/src/combustionModels/FSD/FSDs.C b/src/combustionModels/FSD/FSDs.C
index 8b36ce8f89f47cb2e8c9ec87060c14d8471d5126..1fff6a86e5d5d29fa502e1dc4dcbfd341eb8200e 100644
--- a/src/combustionModels/FSD/FSDs.C
+++ b/src/combustionModels/FSD/FSDs.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,77 +34,71 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- // Combustion models based on sensibleEnthalpy
- makeCombustionTypesThermo
- (
- FSD,
- psiThermoCombustion,
- gasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- psiThermoCombustion,
- constGasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- rhoThermoCombustion,
- gasHThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- rhoThermoCombustion,
- constGasHThermoPhysics,
- rhoCombustionModel
- );
-
- // Combustion models based on sensibleInternalEnergy
- makeCombustionTypesThermo
- (
- FSD,
- psiThermoCombustion,
- gasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- psiThermoCombustion,
- constGasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- rhoThermoCombustion,
- gasEThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- FSD,
- rhoThermoCombustion,
- constGasEThermoPhysics,
- rhoCombustionModel
- );
-}
-}
+// Combustion models based on sensibleEnthalpy
+makeCombustionTypesThermo
+(
+ FSD,
+ psiThermoCombustion,
+ gasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ psiThermoCombustion,
+ constGasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ rhoThermoCombustion,
+ gasHThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ rhoThermoCombustion,
+ constGasHThermoPhysics,
+ rhoCombustionModel
+);
+
+// Combustion models based on sensibleInternalEnergy
+makeCombustionTypesThermo
+(
+ FSD,
+ psiThermoCombustion,
+ gasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ psiThermoCombustion,
+ constGasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ rhoThermoCombustion,
+ gasEThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ FSD,
+ rhoThermoCombustion,
+ constGasEThermoPhysics,
+ rhoCombustionModel
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/PaSR/PaSRs.C b/src/combustionModels/PaSR/PaSRs.C
index 24978b55c4baf4bb87da1f7bdf5e017b55f20fc7..0e52c3f0aaafe3cad29ffc18814a6117b45c1535 100644
--- a/src/combustionModels/PaSR/PaSRs.C
+++ b/src/combustionModels/PaSR/PaSRs.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,14 +31,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- makeCombustionTypes(PaSR, psiChemistryCombustion, psiCombustionModel);
- makeCombustionTypes(PaSR, rhoChemistryCombustion, rhoCombustionModel);
-}
-}
+makeCombustionTypes(PaSR, psiChemistryCombustion, psiCombustionModel);
+makeCombustionTypes(PaSR, rhoChemistryCombustion, rhoCombustionModel);
// ************************************************************************* //
diff --git a/src/combustionModels/combustionModel/makeCombustionTypes.H b/src/combustionModels/combustionModel/makeCombustionTypes.H
index 31f2e8400686916accb44482fbdc80e4839e6a90..4bf871d3b2eb823766e6b6440ce6fefae6415fb8 100644
--- a/src/combustionModels/combustionModel/makeCombustionTypes.H
+++ b/src/combustionModels/combustionModel/makeCombustionTypes.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,43 +30,61 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \
- \
- typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \
- \
- defineTemplateTypeNameAndDebugWithName \
- ( \
- CombModel##CombType##Thermo, \
- #CombModel"<"#CombType","#Thermo">", \
- 0 \
- ); \
- \
- addToRunTimeSelectionTable \
- ( \
- Table, \
- CombModel##CombType##Thermo, \
- dictionary \
- );
+#define makeCombustionTypesThermo(CombModel, CombType, Thermo, Table) \
+ \
+ typedef Foam::combustionModels::CombModel \
+ <Foam::combustionModels::CombType, Foam::Thermo> \
+ CombModel##CombType##Thermo; \
+ \
+ defineTemplateTypeNameAndDebugWithName \
+ ( \
+ CombModel##CombType##Thermo, \
+ #CombModel"<"#CombType","#Thermo">", \
+ 0 \
+ ); \
+ \
+ namespace Foam \
+ { \
+ namespace combustionModels \
+ { \
+ typedef CombModel<CombType, Thermo> CombModel##CombType##Thermo; \
+ addToRunTimeSelectionTable \
+ ( \
+ Table, \
+ CombModel##CombType##Thermo, \
+ dictionary \
+ ); \
+ } \
+ }
-#define makeCombustionTypes(CombModel, CombType, Table) \
- \
- typedef CombModel<CombType> CombModel##CombType; \
- \
- defineTemplateTypeNameAndDebugWithName \
- ( \
- CombModel##CombType, \
- #CombModel"<"#CombType">", \
- 0 \
- ); \
- \
- addToRunTimeSelectionTable \
- ( \
- Table, \
- CombModel##CombType, \
- dictionary \
- );
-
+#define makeCombustionTypes(CombModel, CombType, Table) \
+ \
+ typedef Foam::combustionModels::CombModel \
+ <Foam::combustionModels::CombType> \
+ CombModel##CombType; \
+ \
+ defineTemplateTypeNameAndDebugWithName \
+ ( \
+ CombModel##CombType, \
+ #CombModel"<"#CombType">", \
+ 0 \
+ ); \
+ \
+ namespace Foam \
+ { \
+ namespace combustionModels \
+ { \
+ typedef CombModel<CombType> CombModel##CombType; \
+ \
+ addToRunTimeSelectionTable \
+ ( \
+ Table, \
+ CombModel##CombType, \
+ dictionary \
+ ); \
+ } \
+ }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/diffusion/diffusions.C b/src/combustionModels/diffusion/diffusions.C
index 1e08d210ee080731e65dde25d2dc2ab3cd24ab22..e358c96d34d96666711f0c51f523e87dac734de9 100644
--- a/src/combustionModels/diffusion/diffusions.C
+++ b/src/combustionModels/diffusion/diffusions.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,78 +32,72 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- // Combustion models based on sensibleEnthalpy
- makeCombustionTypesThermo
- (
- diffusion,
- psiThermoCombustion,
- gasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- psiThermoCombustion,
- constGasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- rhoThermoCombustion,
- gasHThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- rhoThermoCombustion,
- constGasHThermoPhysics,
- rhoCombustionModel
- );
-
- // Combustion models based on sensibleInternalEnergy
-
- makeCombustionTypesThermo
- (
- diffusion,
- psiThermoCombustion,
- gasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- psiThermoCombustion,
- constGasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- rhoThermoCombustion,
- gasEThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- diffusion,
- rhoThermoCombustion,
- constGasEThermoPhysics,
- rhoCombustionModel
- );
-}
-}
+// Combustion models based on sensibleEnthalpy
+makeCombustionTypesThermo
+(
+ diffusion,
+ psiThermoCombustion,
+ gasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ psiThermoCombustion,
+ constGasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ rhoThermoCombustion,
+ gasHThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ rhoThermoCombustion,
+ constGasHThermoPhysics,
+ rhoCombustionModel
+);
+
+ // Combustion models based on sensibleInternalEnergy
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ psiThermoCombustion,
+ gasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ psiThermoCombustion,
+ constGasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ rhoThermoCombustion,
+ gasEThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ diffusion,
+ rhoThermoCombustion,
+ constGasEThermoPhysics,
+ rhoCombustionModel
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C
index c2c8b63e6778e1fae749007c49a214662266f392..95e5a79d4f46a40a485b1e46c446d39f9f78e80d 100644
--- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C
+++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,79 +32,73 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- // Combustion models based on sensibleEnthalpy
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- psiThermoCombustion,
- gasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- psiThermoCombustion,
- constGasHThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- rhoThermoCombustion,
- gasHThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- rhoThermoCombustion,
- constGasHThermoPhysics,
- rhoCombustionModel
- );
-
- // Combustion models based on sensibleInternalEnergy
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- psiThermoCombustion,
- gasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- psiThermoCombustion,
- constGasEThermoPhysics,
- psiCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- rhoThermoCombustion,
- gasEThermoPhysics,
- rhoCombustionModel
- );
-
- makeCombustionTypesThermo
- (
- infinitelyFastChemistry,
- rhoThermoCombustion,
- constGasEThermoPhysics,
- rhoCombustionModel
- );
-}
-}
+// Combustion models based on sensibleEnthalpy
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ psiThermoCombustion,
+ gasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ psiThermoCombustion,
+ constGasHThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ rhoThermoCombustion,
+ gasHThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ rhoThermoCombustion,
+ constGasHThermoPhysics,
+ rhoCombustionModel
+);
+
+// Combustion models based on sensibleInternalEnergy
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ psiThermoCombustion,
+ gasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ psiThermoCombustion,
+ constGasEThermoPhysics,
+ psiCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ rhoThermoCombustion,
+ gasEThermoPhysics,
+ rhoCombustionModel
+);
+
+makeCombustionTypesThermo
+(
+ infinitelyFastChemistry,
+ rhoThermoCombustion,
+ constGasEThermoPhysics,
+ rhoCombustionModel
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/combustionModels/laminar/laminars.C b/src/combustionModels/laminar/laminars.C
index 1c7d5526c9e9ad8aa4e5bd5434d99b91edc2efcb..73d400c09585bd4eb3262ad0bb60537a6158603c 100644
--- a/src/combustionModels/laminar/laminars.C
+++ b/src/combustionModels/laminar/laminars.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,14 +31,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- makeCombustionTypes(laminar, psiChemistryCombustion, psiCombustionModel);
- makeCombustionTypes(laminar, rhoChemistryCombustion, rhoCombustionModel);
-}
-}
+makeCombustionTypes(laminar, psiChemistryCombustion, psiCombustionModel);
+makeCombustionTypes(laminar, rhoChemistryCombustion, rhoCombustionModel);
// ************************************************************************* //
diff --git a/src/combustionModels/noCombustion/noCombustions.C b/src/combustionModels/noCombustion/noCombustions.C
index b5a986b9ed5123cef3a98f6a46c37a8ac512edca..516e5af8230b558d49baf11cb19c87c407bc8851 100644
--- a/src/combustionModels/noCombustion/noCombustions.C
+++ b/src/combustionModels/noCombustion/noCombustions.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,25 +34,19 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace combustionModels
-{
- makeCombustionTypes
- (
- noCombustion,
- psiThermoCombustion,
- psiCombustionModel
- );
-
- makeCombustionTypes
- (
- noCombustion,
- rhoThermoCombustion,
- rhoCombustionModel
- );
-}
-}
+makeCombustionTypes
+(
+ noCombustion,
+ psiThermoCombustion,
+ psiCombustionModel
+);
+
+makeCombustionTypes
+(
+ noCombustion,
+ rhoThermoCombustion,
+ rhoCombustionModel
+);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C
index 33385d4ecfabfceeb3d5c53bd1f813f8134c9ae5..c011a40e2d4ffa5d1fa619aa68e20ec423a20222 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvConvectionScheme(boundedConvectionScheme)
-}
-}
+makeFvConvectionScheme(boundedConvectionScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index e871aec19a30be1dfebb7ecace4bfb1b5a56c049..491ed4849602f9d811949252914f8979659da3fa 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -204,12 +204,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvConvectionTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
- add##SS##Type##IstreamConstructorToTable_;
-
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ convectionScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
+ add##SS##Type##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvConvectionScheme(SS) \
\
@@ -221,11 +225,17 @@ makeFvConvectionTypeScheme(SS, tensor)
#define makeMultivariateFvConvectionTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-convectionScheme<Type>::addMultivariateConstructorToTable<SS<Type> > \
- add##SS##Type##MultivariateConstructorToTable_;
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ convectionScheme<Type>:: \
+ addMultivariateConstructorToTable<SS<Type> > \
+ add##SS##Type##MultivariateConstructorToTable_; \
+ } \
+ }
#define makeMultivariateFvConvectionScheme(SS) \
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionSchemes.C
index c5ea8dbac7c3890e4a36b904b0e79a26ecf86453..65386824bc1dd3ccd3190ad1cf3f1c86f61a1d02 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionSchemes.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- int warnUnboundedGauss
- (
- Foam::debug::debugSwitch("warnUnboundedGauss", true)
- );
-
- makeFvConvectionScheme(gaussConvectionScheme)
-}
-}
+int Foam::fv::warnUnboundedGauss
+(
+ Foam::debug::debugSwitch("warnUnboundedGauss", true)
+);
+
+makeFvConvectionScheme(gaussConvectionScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C
index 6bc1ce34d4c4b3e1814b4f4bed583d3a697215d2..cfa0d039ffe9bdf64cd503cfa5832ae0da77b522 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
-}
-}
+makeMultivariateFvConvectionScheme(multivariateGaussConvectionScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Schemes.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Schemes.C
index 8711c43244f75b4666d065da83810ffadcf5ca07..5b08cebdf59c6a5b4398cfea956cdf62dd751827 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Schemes.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Schemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvD2dt2Scheme(EulerD2dt2Scheme)
-}
-}
+makeFvD2dt2Scheme(EulerD2dt2Scheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index d7878191ffd3ff5f11f813dd85f2467b3bd9877f..55e2fd21e210f27a8747773777b5660914120d30 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -181,12 +181,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvD2dt2TypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \
- add##SS##Type##IstreamConstructorToTable_;
-
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ d2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \
+ add##SS##Type##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvD2dt2Scheme(SS) \
\
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C
index 7ef9837d02743a14de126699fe5ffc00e3d9d50f..418f5d59f8ab12dca4a21f96f6b36d3164450255 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Schemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
-}
-}
+makeFvD2dt2Scheme(steadyStateD2dt2Scheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtSchemes.C
index 64a369e6ef6ac15625a10ae6cc9231bf85c99624..3e7866eccd6f2ef5129e2fd78998a62e15aedfc0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(CoEulerDdtScheme)
-}
-}
+makeFvDdtScheme(CoEulerDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
index 3166243a9cc8a4053b803c06760f9959d87d21d2..e2ecc849aedbe3cb7199f1df6d426b314e32233c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(CrankNicolsonDdtScheme)
-}
-}
+makeFvDdtScheme(CrankNicolsonDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtSchemes.C
index 6207a2b45a184e7c468a117cce45873aa2875872..aa189acecc339d16ce9767c8fe6a1c27d416fdff 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(EulerDdtScheme)
-}
-}
+makeFvDdtScheme(EulerDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C
index 22c7b9a64fd6655a0f73deaaa4832a28a37d0889..eb00cc4399ab5e2ef9315a05ad436983697615cb 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(SLTSDdtScheme)
-}
-}
+makeFvDdtScheme(SLTSDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtSchemes.C
index 97b2d39a5c69282e8c675c0a51f51a5216ac5f68..e6f2a56dd7235076e92e5dcc7c82733133c3cbb3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(backwardDdtScheme)
-}
-}
+makeFvDdtScheme(backwardDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtSchemes.C
index 8971a237e58c4db9f8d60c93e648c58ae0a9addb..f600cd36a7c82c195e079a0b13a1fd89dd02a2e3 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(boundedDdtScheme)
-}
-}
+makeFvDdtScheme(boundedDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index dccf7f9619d9febffd6713fbe15e962c4d4c15b0..a8d4301c5760f473e37b56c1e5fd0e4897f9b4e2 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -257,12 +257,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvDdtTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-ddtScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
- add##SS##Type##IstreamConstructorToTable_;
-
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ ddtScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
+ add##SS##Type##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvDdtScheme(SS) \
\
@@ -272,6 +276,11 @@ makeFvDdtTypeScheme(SS, sphericalTensor) \
makeFvDdtTypeScheme(SS, symmTensor) \
makeFvDdtTypeScheme(SS, tensor) \
\
+namespace Foam \
+{ \
+namespace fv \
+{ \
+ \
template<> \
tmp<surfaceScalarField> SS<scalar>::fvcDdtUfCorr \
( \
@@ -316,6 +325,9 @@ tmp<surfaceScalarField> SS<scalar>::fvcDdtPhiCorr \
{ \
notImplemented(#SS"<scalar>::fvcDdtPhiCorr"); \
return surfaceScalarField::null(); \
+} \
+ \
+} \
}
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C
index 8fed9dfa57c5f50ce3d4dded10b86c1f87c77fed..45099e1a652c180583bc396f0ec5b7e4a90a923f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(localEulerDdtScheme)
-}
-}
+makeFvDdtScheme(localEulerDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtSchemes.C
index 814b51bfa087a0727f68d085d57546231bb622bb..80afc3a9a3b374b91a40761f454a41ae3fbd4414 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtSchemes.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDdtScheme(steadyStateDdtScheme)
-}
-}
+makeFvDdtScheme(steadyStateDdtScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index b3379204803548e283c5284270b0bbe16b7255d4..4032e2d5cf0cdc1d600c0196df1d5749379eaa66 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -165,12 +165,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvDivTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
- add##SS##Type##IstreamConstructorToTable_;
-
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ divScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
+ add##SS##Type##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvDivScheme(SS) \
\
diff --git a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivSchemes.C b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivSchemes.C
index bde36e2c663f64e8dca50e9962ffdcf7561c5d3e..2d25bb6b88c0d3b1d840943a694c8426457cf7b7 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivSchemes.C
+++ b/src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvDivScheme(gaussDivScheme)
-}
-}
+makeFvDivScheme(gaussDivScheme)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
index edc94184650bf43270d9f30900c88ff007f0809a..a71d0e87abd13849fa2904d61a269b872bfac389 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -142,24 +142,35 @@ public:
// Add the patch constructor functions to the hash tables
-#define makeLeastSquaresGradTypeScheme(SS, STENCIL, TYPE) \
- \
-typedef LeastSquaresGrad<TYPE, STENCIL> LeastSquaresGrad##TYPE##STENCIL##_; \
-defineTemplateTypeNameAndDebugWithName \
- (LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \
- \
-gradScheme<TYPE>::addIstreamConstructorToTable \
-<LeastSquaresGrad<TYPE, STENCIL> > \
- add##SS##STENCIL##TYPE##IstreamConstructorToTable_;
-
-#define makeLeastSquaresGradScheme(SS, STENCIL) \
- \
-typedef LeastSquaresVectors<STENCIL> LeastSquaresVectors##STENCIL##_; \
-defineTemplateTypeNameAndDebugWithName \
- (LeastSquaresVectors##STENCIL##_, #SS, 0); \
- \
-makeLeastSquaresGradTypeScheme(SS,STENCIL,scalar) \
-makeLeastSquaresGradTypeScheme(SS,STENCIL,vector)
+#define makeLeastSquaresGradTypeScheme(SS, STENCIL, TYPE) \
+ typedef Foam::fv::LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> \
+ LeastSquaresGrad##TYPE##STENCIL##_; \
+ \
+ defineTemplateTypeNameAndDebugWithName \
+ (LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \
+ \
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ typedef LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> \
+ LeastSquaresGrad##TYPE##STENCIL##_; \
+ \
+ gradScheme<Foam::TYPE>::addIstreamConstructorToTable \
+ <LeastSquaresGrad<Foam::TYPE, Foam::STENCIL> > \
+ add##SS##STENCIL##TYPE##IstreamConstructorToTable_; \
+ } \
+ }
+
+#define makeLeastSquaresGradScheme(SS, STENCIL) \
+ typedef Foam::fv::LeastSquaresVectors<Foam::STENCIL> \
+ LeastSquaresVectors##STENCIL##_; \
+ \
+ defineTemplateTypeNameAndDebugWithName \
+ (LeastSquaresVectors##STENCIL##_, #SS, 0); \
+ \
+ makeLeastSquaresGradTypeScheme(SS,STENCIL,scalar) \
+ makeLeastSquaresGradTypeScheme(SS,STENCIL,vector)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C
index 021e2da28ef2c0352e3a0d2f6dc8be830c57ad08..3b48f3fd594a779090cb0f3b34817d2789ee477a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,28 +30,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- // makeLeastSquaresGradScheme
- // (
- // faceCellsLeastSquares,
- // centredCFCCellToCellStencilObject
- // )
-
- makeLeastSquaresGradScheme
- (
- pointCellsLeastSquares,
- centredCPCCellToCellStencilObject
- )
-
- makeLeastSquaresGradScheme
- (
- edgeCellsLeastSquares,
- centredCECCellToCellStencilObject
- )
-}
-}
+// makeLeastSquaresGradScheme
+// (
+// faceCellsLeastSquares,
+// centredCFCCellToCellStencilObject
+// )
+
+makeLeastSquaresGradScheme
+(
+ pointCellsLeastSquares,
+ centredCPCCellToCellStencilObject
+)
+
+makeLeastSquaresGradScheme
+(
+ edgeCellsLeastSquares,
+ centredCECCellToCellStencilObject
+)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C
index 2f385c715075321d906246b67d0a371767d44c6f..70440597466d495d711256417f112b1f48c5ea52 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,14 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
-
- makeFvGradScheme(fourthGrad)
-
-} // End namespace fv
-} // End namespace Foam
+makeFvGradScheme(fourthGrad)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrads.C
index 9a6d1e81cb5871c80c8461ac9ad45b19bdbb815c..f395adaa93d0533aabd8800e5ae004395b3d7913 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(gaussGrad)
-}
-}
+makeFvGradScheme(gaussGrad)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
index ce1e90d3432b38a8eab0b384eb5dcd16c0be5ca0..aa508ab8b6182abafd80036ebd5d0192da1b7b38 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvGradTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
- add##SS##Type##IstreamConstructorToTable_;
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ gradScheme<Type>::addIstreamConstructorToTable<SS<Type> > \
+ add##SS##Type##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvGradScheme(SS) \
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrads.C
index 8c1cfe08ec7b18a9f9e6f74cc676313d137e8e1d..2f44144d0bd35d52e4d892bc57f09e7b3bb81c89 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,12 +28,6 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(leastSquaresGrad)
-}
-}
+makeFvGradScheme(leastSquaresGrad)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
index 566b81304ebd6c10273c8f6ad559d9e50dad0975..14064aa9e225db82689151d5712c6dda5969f3f7 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,13 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(cellLimitedGrad)
-}
-}
+makeFvGradScheme(cellLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
index 75649ec0d751850abd1b4232bb8149a3588ee288..594ad63dd9e8f36a21219bc4133d6b3b8085aac3 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(cellMDLimitedGrad)
-}
-}
-
+makeFvGradScheme(cellMDLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
index 5b25f58204040ce305a15c6de885ad2fc94083b8..c37b14a298f1814edc3e216cda324050dfc41243 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,14 +33,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(faceLimitedGrad)
-}
-}
-
+makeFvGradScheme(faceLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
index 4006fd5e706204c2495defa260f066525148caf6..9a43689fd482d56e98231ed9dfaddfd7035504c0 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,13 +34,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvGradScheme(faceMDLimitedGrad)
-}
-}
+makeFvGradScheme(faceMDLimitedGrad)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
index fd983f3751e77d06b0364e74cbcaaf4d2bc6abaf..b7c2e25b8ab5c2ce5583fbd85d86879114f54015 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvLaplacianScheme(gaussLaplacianScheme)
-}
-}
+makeFvLaplacianScheme(gaussLaplacianScheme)
#define declareFvmLaplacianScalarGamma(Type) \
\
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index 529e55bdbe9f49276a20dbc4a5e3f09d73aa029f..781d2044d5b3f3a436d15fe8e14691a266ebc6a2 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -212,13 +212,20 @@ public:
// Add the patch constructor functions to the hash tables
#define makeFvLaplacianTypeScheme(SS, GType, Type) \
- \
- typedef SS<Type, GType> SS##Type##GType; \
+ typedef Foam::fv::SS<Foam::Type, Foam::GType> SS##Type##GType; \
defineNamedTemplateTypeNameAndDebug(SS##Type##GType, 0); \
\
- laplacianScheme<Type, GType>:: \
- addIstreamConstructorToTable<SS<Type, GType> > \
- add##SS##Type##GType##IstreamConstructorToTable_;
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ typedef SS<Type, GType> SS##Type##GType; \
+ \
+ laplacianScheme<Type, GType>:: \
+ addIstreamConstructorToTable<SS<Type, GType> > \
+ add##SS##Type##GType##IstreamConstructorToTable_; \
+ } \
+ }
#define makeFvLaplacianScheme(SS) \
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
index d92478c31741aa7597949bc4a20e20d29b943b1c..4cebfa3e7b3fb10aa83d77a232d4bd61db31af84 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -156,24 +156,31 @@ public:
// Add the patch constructor functions to the hash tables
-#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
- \
-typedef CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> \
- CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \
-defineTemplateTypeNameAndDebugWithName \
- (CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \
- \
-snGradScheme<TYPE>::addMeshConstructorToTable \
-<CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \
- add##SS##STENCIL##TYPE##MeshConstructorToTable_;
-
-#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \
- \
-makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
-makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
-makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
-makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
-makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
+#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
+ typedef Foam::fv::CentredFitSnGradScheme \
+ <Foam::TYPE, Foam::POLYNOMIAL, Foam::STENCIL> \
+ CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \
+ \
+ defineTemplateTypeNameAndDebugWithName \
+ (CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \
+ \
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ snGradScheme<TYPE>::addMeshConstructorToTable \
+ <CentredFitSnGradScheme<TYPE, POLYNOMIAL, STENCIL> > \
+ add##SS##STENCIL##TYPE##MeshConstructorToTable_; \
+ } \
+ }
+
+#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \
+ \
+ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \
+ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \
+ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
+ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
+ makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C
index fee7bfca24a4d323d6bf10ad895fcd6785b958cc..08906fd487b0d0fe137f6e9f1159d731426cf9ee 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,14 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeSnGradScheme(correctedSnGrad)
-}
-}
-
+makeSnGradScheme(correctedSnGrad)
template<>
Foam::tmp<Foam::surfaceScalarField>
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C
index ba6d83542eb2cb3c70a152c99d457764382cb0de..73ba877fdb9157830c90c9a2666e7f0255783196 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,13 +28,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeSnGradScheme(faceCorrectedSnGrad)
-}
-}
+makeSnGradScheme(faceCorrectedSnGrad)
template<>
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrads.C
index 1ed8ebe5fa1de6f6beb9d56e895374d9ebc7a542..177762a11c27bc23e2ec9cec05a589f179a8a68b 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,12 +35,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeSnGradScheme(limitedSnGrad)
-}
-}
+makeSnGradScheme(limitedSnGrad)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/linearFitSnGrad/linearFitSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/linearFitSnGrad/linearFitSnGrads.C
index 4335cc8e69fe663a4d8f62dba81f7f20ac6e786b..1354c582bbcc71696514d3fbb88d49d9b64cac97 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/linearFitSnGrad/linearFitSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/linearFitSnGrad/linearFitSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,16 +36,13 @@ namespace Foam
CentredFitSnGradData<linearFitPolynomial>,
0
);
-
- namespace fv
- {
- makeCentredFitSnGradScheme
- (
- linearFit,
- linearFitPolynomial,
- centredFECCellToFaceStencilObject
- );
- }
}
+makeCentredFitSnGradScheme
+(
+ linearFit,
+ linearFitPolynomial,
+ centredFECCellToFaceStencilObject
+);
+
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
index 4597bb43ffeaf88235a495e1e2ce36f363f95b11..dda3b6bd6151dd2f10ee40042597a45d0096a44f 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,12 +31,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeSnGradScheme(orthogonalSnGrad)
-}
-}
+makeSnGradScheme(orthogonalSnGrad)
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
index 63e4ea98fac49e8eaaf484e6290b7a149bee2eec..40cf5ae54446e3a3d066af2c6f17df41e54de9eb 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,16 +36,14 @@ namespace Foam
CentredFitSnGradData<quadraticFitPolynomial>,
0
);
-
- namespace fv
- {
- makeCentredFitSnGradScheme
- (
- quadraticFit,
- quadraticFitPolynomial,
- centredCFCCellToFaceStencilObject
- );
- }
}
+makeCentredFitSnGradScheme
+(
+ quadraticFit,
+ quadraticFitPolynomial,
+ centredCFCCellToFaceStencilObject
+);
+
+
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index 8452a907acecbd520f94d8ee83da1d162e958ec7..e507cc837f914dbd54e2d36993e12d93a67c87ec 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -189,11 +189,16 @@ public:
// Add the patch constructor functions to the hash tables
#define makeSnGradTypeScheme(SS, Type) \
+ defineNamedTemplateTypeNameAndDebug(Foam::fv::SS<Foam::Type>, 0); \
\
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0); \
- \
-snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \
- add##SS##Type##MeshConstructorToTable_;
+ namespace Foam \
+ { \
+ namespace fv \
+ { \
+ snGradScheme<Type>::addMeshConstructorToTable<SS<Type> > \
+ add##SS##Type##MeshConstructorToTable_; \
+ } \
+ }
#define makeSnGradScheme(SS) \
\
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrads.C
index 161244a4ca76ee4dee61e88db4171b2bd7db0131..458fe101186f08bb2cab4ea366138fbc6836e347 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrads.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,12 +31,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeSnGradScheme(uncorrectedSnGrad)
-}
-}
+makeSnGradScheme(uncorrectedSnGrad)
// ************************************************************************* //
diff --git a/src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C b/src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
index d3420bef8dcbcb9539fd899817e4c266686c99bf..2e4dea145faf003d583d146cc6f9c30c4d217445 100644
--- a/src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
+++ b/src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvOption(ExplicitSetValue, scalar);
- makeFvOption(ExplicitSetValue, vector);
- makeFvOption(ExplicitSetValue, sphericalTensor);
- makeFvOption(ExplicitSetValue, symmTensor);
- makeFvOption(ExplicitSetValue, tensor);
-}
-}
+makeFvOption(ExplicitSetValue, scalar);
+makeFvOption(ExplicitSetValue, vector);
+makeFvOption(ExplicitSetValue, sphericalTensor);
+makeFvOption(ExplicitSetValue, symmTensor);
+makeFvOption(ExplicitSetValue, tensor);
// ************************************************************************* //
diff --git a/src/fvOptions/fvOptions/makeFvOption.H b/src/fvOptions/fvOptions/makeFvOption.H
index 8900f4d3460d55f83ce572b9888805013a5ed9c4..bb4c686a4c5130810baa34f9836934879e2bbced 100644
--- a/src/fvOptions/fvOptions/makeFvOption.H
+++ b/src/fvOptions/fvOptions/makeFvOption.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,12 +35,13 @@ License
\
defineTemplateTypeNameAndDebugWithName \
( \
- Option<Type>, \
+ Foam::fv::Option<Foam::Type>, \
#Type#Option, \
0 \
); \
\
- option::adddictionaryConstructorToTable<Option<Type> > \
+ Foam::fv::option::adddictionaryConstructorToTable \
+ <Foam::fv::Option<Foam::Type> > \
add##Option##Type##dictionary##ConstructorTooptionTable_
diff --git a/src/fvOptions/sources/general/codedSource/codedSource.C b/src/fvOptions/sources/general/codedSource/codedSource.C
index 654caa7c20ca4fef4816835c422122cc0ed6ca2b..05ec6d2405c087d599ab1c7d7c340d4fdca014d3 100644
--- a/src/fvOptions/sources/general/codedSource/codedSource.C
+++ b/src/fvOptions/sources/general/codedSource/codedSource.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvOption(CodedSource, scalar);
- makeFvOption(CodedSource, vector);
- makeFvOption(CodedSource, sphericalTensor);
- makeFvOption(CodedSource, symmTensor);
- makeFvOption(CodedSource, tensor);
-}
-}
+makeFvOption(CodedSource, scalar);
+makeFvOption(CodedSource, vector);
+makeFvOption(CodedSource, sphericalTensor);
+makeFvOption(CodedSource, symmTensor);
+makeFvOption(CodedSource, tensor);
// ************************************************************************* //
diff --git a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
index 0fb667ff06c074b6f740ac30577dd90378a856d7..b8ae8007692de9afcccd56743b7f38af8560d910 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,17 +28,11 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-namespace fv
-{
- makeFvOption(SemiImplicitSource, scalar);
- makeFvOption(SemiImplicitSource, vector);
- makeFvOption(SemiImplicitSource, sphericalTensor);
- makeFvOption(SemiImplicitSource, symmTensor);
- makeFvOption(SemiImplicitSource, tensor);
-}
-}
+makeFvOption(SemiImplicitSource, scalar);
+makeFvOption(SemiImplicitSource, vector);
+makeFvOption(SemiImplicitSource, sphericalTensor);
+makeFvOption(SemiImplicitSource, symmTensor);
+makeFvOption(SemiImplicitSource, tensor);
// ************************************************************************* //
diff --git a/src/lagrangian/Turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/Turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
index d2428ba4b23172e7d44407fdfc5f11cf3313be06..2ca6ac93baccb8b27dfa09afbf4c28d171a292a1 100644
--- a/src/lagrangian/Turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
+++ b/src/lagrangian/Turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
@@ -35,10 +35,10 @@ License
#define makeParcelTurbulenceDispersionModels(CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- DispersionRASModel<kinematicCloudType>, \
+ Foam::DispersionRASModel<kinematicCloudType>, \
0 \
); \
\
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
index b07c64638e7559f7e63089629c3c9c7feffeca2a..8012c20e32015e5556d5bf0fafc26795e38846a1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,19 +38,16 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicKinematicCollidingCloud);
-
- // Kinematic sub-models
- makeParcelForces(basicKinematicCollidingCloud);
- makeParcelDispersionModels(basicKinematicCollidingCloud);
- makeParcelInjectionModels(basicKinematicCollidingCloud);
- makeParcelCollisionModels(basicKinematicCollidingCloud);
- makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
- makeParcelStochasticCollisionModels(basicKinematicCollidingCloud);
- makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
-}
+makeParcelCloudFunctionObjects(basicKinematicCollidingCloud);
+
+// Kinematic sub-models
+makeParcelForces(basicKinematicCollidingCloud);
+makeParcelDispersionModels(basicKinematicCollidingCloud);
+makeParcelInjectionModels(basicKinematicCollidingCloud);
+makeParcelCollisionModels(basicKinematicCollidingCloud);
+makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
+makeParcelStochasticCollisionModels(basicKinematicCollidingCloud);
+makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C
index 735c21f3efc714365ae45398c5ec3b247db00fdd..b15bc07b4220462057a9cf2e5b20ef4f630a8915 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
#include "makeParcelCloudFunctionObjects.H"
-// kinematic sub-models
+// Kinematic sub-models
#include "makeParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeParcelInjectionModels.H"
@@ -42,23 +42,21 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicKinematicMPPICCloud);
+makeParcelCloudFunctionObjects(basicKinematicMPPICCloud);
- // kinematic sub-models
- makeParcelForces(basicKinematicMPPICCloud);
- makeParcelDispersionModels(basicKinematicMPPICCloud);
- makeParcelInjectionModels(basicKinematicMPPICCloud);
- makeParcelPatchInteractionModels(basicKinematicMPPICCloud);
- makeParcelStochasticCollisionModels(basicKinematicMPPICCloud);
- makeParcelSurfaceFilmModels(basicKinematicMPPICCloud);
+// Kinematic sub-models
+makeParcelForces(basicKinematicMPPICCloud);
- // MPPIC sub-models
- makeMPPICParcelDampingModels(basicKinematicMPPICCloud);
- makeMPPICParcelIsotropyModels(basicKinematicMPPICCloud);
- makeMPPICParcelPackingModels(basicKinematicMPPICCloud);
-}
+makeParcelDispersionModels(basicKinematicMPPICCloud);
+makeParcelInjectionModels(basicKinematicMPPICCloud);
+makeParcelPatchInteractionModels(basicKinematicMPPICCloud);
+makeParcelStochasticCollisionModels(basicKinematicMPPICCloud);
+makeParcelSurfaceFilmModels(basicKinematicMPPICCloud);
+
+// MPPIC sub-models
+makeMPPICParcelDampingModels(basicKinematicMPPICCloud);
+makeMPPICParcelIsotropyModels(basicKinematicMPPICCloud);
+makeMPPICParcelPackingModels(basicKinematicMPPICCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index 1aaa9590fc3320dbaf88553736d785e80d9c00da..5969a45f0fa8e6c8d1f88c24cd38b8f897a1d6e1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,18 +37,15 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicKinematicCloud);
-
- // Kinematic sub-models
- makeParcelForces(basicKinematicCloud);
- makeParcelDispersionModels(basicKinematicCloud);
- makeParcelInjectionModels(basicKinematicCloud);
- makeParcelPatchInteractionModels(basicKinematicCloud);
- makeParcelStochasticCollisionModels(basicKinematicCloud);
- makeParcelSurfaceFilmModels(basicKinematicCloud);
-}
+makeParcelCloudFunctionObjects(basicKinematicCloud);
+
+// Kinematic sub-models
+makeParcelForces(basicKinematicCloud);
+makeParcelDispersionModels(basicKinematicCloud);
+makeParcelInjectionModels(basicKinematicCloud);
+makeParcelPatchInteractionModels(basicKinematicCloud);
+makeParcelStochasticCollisionModels(basicKinematicCloud);
+makeParcelSurfaceFilmModels(basicKinematicCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index bafe2cdd26aaaf6b8ec2bf395b35615fcdcd9749..e5688944dfc5cc56bb8b64e04bf9b846db3bc2b0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,41 +48,38 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
-
- // Kinematic sub-models
- makeThermoParcelForces(basicReactingMultiphaseCloud);
- makeParcelDispersionModels(basicReactingMultiphaseCloud);
- makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
- makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
- makeReactingMultiphaseParcelStochasticCollisionModels
- (
- basicReactingMultiphaseCloud
- );
- makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud);
-
- // Thermo sub-models
- makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
-
- // Reacting sub-models
- makeReactingMultiphaseParcelCompositionModels
- (
- basicReactingMultiphaseCloud
- );
- makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
-
- // Reacting multiphase sub-models
- makeReactingMultiphaseParcelDevolatilisationModels
- (
- basicReactingMultiphaseCloud
- );
- makeReactingMultiphaseParcelSurfaceReactionModels
- (
- basicReactingMultiphaseCloud
- );
-}
+makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
+
+// Kinematic sub-models
+makeThermoParcelForces(basicReactingMultiphaseCloud);
+makeParcelDispersionModels(basicReactingMultiphaseCloud);
+makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
+makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
+makeReactingMultiphaseParcelStochasticCollisionModels
+(
+ basicReactingMultiphaseCloud
+);
+makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud);
+
+// Thermo sub-models
+makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
+
+// Reacting sub-models
+makeReactingMultiphaseParcelCompositionModels
+(
+ basicReactingMultiphaseCloud
+);
+makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud);
+
+// Reacting multiphase sub-models
+makeReactingMultiphaseParcelDevolatilisationModels
+(
+ basicReactingMultiphaseCloud
+);
+makeReactingMultiphaseParcelSurfaceReactionModels
+(
+ basicReactingMultiphaseCloud
+);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
index e9eb87a2cd06c54853cf897fb59286f8140bd1c0..97e58ffe3a0fed38a5767c515764fa2f5338aeeb 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,25 +44,22 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicReactingCloud);
-
- // Kinematic sub-models
- makeThermoParcelForces(basicReactingCloud);
- makeParcelDispersionModels(basicReactingCloud);
- makeReactingParcelInjectionModels(basicReactingCloud);
- makeParcelPatchInteractionModels(basicReactingCloud);
- makeParcelStochasticCollisionModels(basicReactingCloud);
- makeReactingParcelSurfaceFilmModels(basicReactingCloud);
-
- // Thermo sub-models
- makeParcelHeatTransferModels(basicReactingCloud);
-
- // Reacting sub-models
- makeReactingParcelCompositionModels(basicReactingCloud);
- makeReactingParcelPhaseChangeModels(basicReactingCloud);
-}
+makeParcelCloudFunctionObjects(basicReactingCloud);
+
+// Kinematic sub-models
+makeThermoParcelForces(basicReactingCloud);
+makeParcelDispersionModels(basicReactingCloud);
+makeReactingParcelInjectionModels(basicReactingCloud);
+makeParcelPatchInteractionModels(basicReactingCloud);
+makeParcelStochasticCollisionModels(basicReactingCloud);
+makeReactingParcelSurfaceFilmModels(basicReactingCloud);
+
+// Thermo sub-models
+makeParcelHeatTransferModels(basicReactingCloud);
+
+// Reacting sub-models
+makeReactingParcelCompositionModels(basicReactingCloud);
+makeReactingParcelPhaseChangeModels(basicReactingCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index ba6d30bb91ca1c09292c0343abfa4e894cba528d..71f2c085bc5deb440d722cb9966eb21589080c5f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,21 +40,18 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicThermoCloud);
-
- // Kinematic sub-models
- makeThermoParcelForces(basicThermoCloud);
- makeParcelDispersionModels(basicThermoCloud);
- makeParcelInjectionModels(basicThermoCloud);
- makeParcelPatchInteractionModels(basicThermoCloud);
- makeParcelStochasticCollisionModels(basicThermoCloud);
- makeParcelSurfaceFilmModels(basicThermoCloud);
-
- // Thermo sub-models
- makeParcelHeatTransferModels(basicThermoCloud);
-}
+makeParcelCloudFunctionObjects(basicThermoCloud);
+
+// Kinematic sub-models
+makeThermoParcelForces(basicThermoCloud);
+makeParcelDispersionModels(basicThermoCloud);
+makeParcelInjectionModels(basicThermoCloud);
+makeParcelPatchInteractionModels(basicThermoCloud);
+makeParcelStochasticCollisionModels(basicThermoCloud);
+makeParcelSurfaceFilmModels(basicThermoCloud);
+
+// Thermo sub-models
+makeParcelHeatTransferModels(basicThermoCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
index 9513a59cc3724e710006b65c92b72f8124ab3b39..61011a66a6bfff53d77e9b02fa9195ba6a3d8e96 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,11 +38,9 @@ License
\
makeDampingModel(CloudType); \
\
- namespace DampingModels \
- { \
- makeDampingModelType(NoDamping, CloudType); \
- makeDampingModelType(Relaxation, CloudType); \
- }
+ makeDampingModelType(NoDamping, CloudType); \
+ makeDampingModelType(Relaxation, CloudType);
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
index eebab863ea6d7ba5c374d6a4b48f2c85dee7ed98..0780a03d6bde746e9a9eff1ce26f2c26e7cbcaf1 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelIsotropyModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,11 +37,8 @@ License
\
makeIsotropyModel(CloudType); \
\
- namespace IsotropyModels \
- { \
- makeIsotropyModelType(NoIsotropy, CloudType); \
- makeIsotropyModelType(Stochastic, CloudType); \
- }
+ makeIsotropyModelType(NoIsotropy, CloudType); \
+ makeIsotropyModelType(Stochastic, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
index 2a57875b492e4e9701d056d1eb4576e959969c9f..cdcbf17aa87e6028e96c5293668b09186e7dac1d 100644
--- a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelPackingModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,12 +38,9 @@ License
\
makePackingModel(CloudType); \
\
- namespace PackingModels \
- { \
- makePackingModelType(NoPacking, CloudType); \
- makePackingModelType(Explicit, CloudType); \
- makePackingModelType(Implicit, CloudType); \
- }
+ makePackingModelType(NoPacking, CloudType); \
+ makePackingModelType(Explicit, CloudType); \
+ makePackingModelType(Implicit, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
index e949d6e0ad57afaedb2de797d1d63487257e70f0..d661155657fb0c0eb38c778bd5aaf34c44402549 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelStochasticCollisionModels.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeParcelStochasticCollisionModels(CloudType) \
+#define makeParcelStochasticCollisionModels(CloudType) \
\
makeStochasticCollisionModel(CloudType); \
makeStochasticCollisionModelType(NoStochasticCollision, CloudType);
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index d5b9369df775a54046119e356d365b07559c1514..616e6314be7b0e09a05a04972ff23282d1752bd8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -186,28 +186,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeCloudFunctionObject(CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug \
- ( \
- CloudFunctionObject<kinematicCloudType>, \
- 0 \
- ); \
- defineTemplateRunTimeSelectionTable \
- ( \
- CloudFunctionObject<kinematicCloudType>, \
- dictionary \
- );
-
-
-#define makeCloudFunctionObjectType(SS, CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
- \
- CloudFunctionObject<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
+#define makeCloudFunctionObject(CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ ( \
+ Foam::CloudFunctionObject<kinematicCloudType>, \
+ 0 \
+ ); \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ CloudFunctionObject<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
+
+
+#define makeCloudFunctionObjectType(SS, CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
+ \
+ Foam::CloudFunctionObject<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
index dfaf223a8d8c6afb13d607128c198fe1cb2edbab..ff92ce44c873a39b3ccee61342779638c2c0ee32 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -141,26 +141,29 @@ public:
#define makeCollisionModel(CloudType) \
\
- typedef CloudType::collidingCloudType collidingCloudType; \
+ typedef Foam::CloudType::collidingCloudType collidingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- CollisionModel<collidingCloudType>, \
+ Foam::CollisionModel<collidingCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- CollisionModel<collidingCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ CollisionModel<collidingCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeCollisionModelType(SS, CloudType) \
\
- typedef CloudType::collidingCloudType collidingCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<collidingCloudType>, 0); \
+ typedef Foam::CloudType::collidingCloudType collidingCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<collidingCloudType>, 0); \
\
- CollisionModel<collidingCloudType>:: \
- adddictionaryConstructorToTable<SS<collidingCloudType> > \
+ Foam::CollisionModel<collidingCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<collidingCloudType> > \
add##SS##CloudType##collidingCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
index cd44be846bb581214d37b73e8fed8161a0568ce7..1be43b5080c3b7dac071969d53dd285033dc4929 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -146,20 +146,24 @@ public:
#define makePairModel(CloudType) \
\
- defineNamedTemplateTypeNameAndDebug(PairModel<CloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug(Foam::PairModel<Foam::CloudType>, 0); \
\
- defineTemplateRunTimeSelectionTable \
- ( \
- PairModel<CloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ PairModel<Foam::CloudType>, \
+ dictionary \
+ ); \
+ }
#define makePairModelType(SS, CloudType) \
\
- defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0); \
\
- PairModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \
+ Foam::PairModel<Foam::CloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> > \
add##SS##CloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
index f2b954b8d956891684c0e908cb8cd298cb743a7e..93ff310ba2af754a49ab079e3d3f51d8d006a5b0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -156,21 +156,25 @@ public:
#define makeWallModel(CloudType) \
\
- defineNamedTemplateTypeNameAndDebug(WallModel<CloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug(Foam::WallModel<Foam::CloudType>, 0); \
\
- defineTemplateRunTimeSelectionTable \
- ( \
- WallModel<CloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ WallModel<Foam::CloudType>, \
+ dictionary \
+ ); \
+ }
#define makeWallModelType(SS, CloudType) \
\
- defineNamedTemplateTypeNameAndDebug(SS<CloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<Foam::CloudType>, 0); \
\
- WallModel<CloudType>::adddictionaryConstructorToTable<SS<CloudType> > \
- add##SS##CloudType##ConstructorToTable_;
+ Foam::WallModel<Foam::CloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<Foam::CloudType> > \
+ add##SS##CloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 323b853907bf5bab45897640194e8e04a97b59b8..7e85e0eb26e28979ba3a85017ec61c0da308e16e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -132,22 +132,26 @@ public:
#define makeDispersionModel(CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineTemplateTypeNameAndDebug(DispersionModel<kinematicCloudType>, 0); \
- defineTemplateRunTimeSelectionTable \
- ( \
- DispersionModel<kinematicCloudType>, \
- dictionary \
- );
-
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineTemplateTypeNameAndDebug \
+ (Foam::DispersionModel<kinematicCloudType>, 0); \
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ DispersionModel<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeDispersionModelType(SS, CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
- DispersionModel<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
+ Foam::DispersionModel<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index d9b8505bb550ed96f06f324ed7e41629ddb4736d..b44039633c5e08cabfb70803e3e038473e805bf3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -357,27 +357,31 @@ public:
#define makeInjectionModel(CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- InjectionModel<kinematicCloudType>, \
+ Foam::InjectionModel<kinematicCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- InjectionModel<kinematicCloudType>, \
- dictionary \
- );
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ InjectionModel<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeInjectionModelType(SS, CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
- InjectionModel<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
- add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
+ Foam::InjectionModel<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
+ add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
index a72abc321743c1dc6df2333d9e6877dc4e56027a..c2ef62d5361a2a6cf86d5c4e7117401e5f2d0210 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -193,25 +193,30 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeParticleForceModel(CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(ParticleForce<kinematicCloudType>, 0);\
- defineTemplateRunTimeSelectionTable \
- ( \
- ParticleForce<kinematicCloudType>, \
- dictionary \
- );
-
-
-#define makeParticleForceModelType(SS, CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
- \
- ParticleForce<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
- add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
+#define makeParticleForceModel(CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::ParticleForce<kinematicCloudType>, 0); \
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ ParticleForce<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
+
+
+#define makeParticleForceModelType(SS, CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
+ \
+ Foam::ParticleForce<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
+ add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index cd94e369d43298f9bea7af0eaa7744a6062da2ec..bfc4ae277b13a0690086fb94f8b649347bf980c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -174,26 +174,30 @@ public:
#define makePatchInteractionModel(CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- PatchInteractionModel<kinematicCloudType>, \
+ Foam::PatchInteractionModel<kinematicCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- PatchInteractionModel<kinematicCloudType>, \
- dictionary \
- );
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ PatchInteractionModel<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
#define makePatchInteractionModelType(SS, CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
- PatchInteractionModel<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
+ Foam::PatchInteractionModel<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
index b7f864194125534ad103ce277008d427cecef976..823a458aee77ae7f5c8b9dcb15750d9bd3fd7939 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/StochasticCollision/StochasticCollisionModel/StochasticCollisionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -131,28 +131,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeStochasticCollisionModel(CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug \
- ( \
- StochasticCollisionModel<kinematicCloudType>, \
- 0 \
- ); \
- defineTemplateRunTimeSelectionTable \
- ( \
- StochasticCollisionModel<kinematicCloudType>, \
- dictionary \
- );
+#define makeStochasticCollisionModel(CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ ( \
+ Foam::StochasticCollisionModel<kinematicCloudType>, \
+ 0 \
+ ); \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ StochasticCollisionModel<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeStochasticCollisionModelType(SS, CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
\
- StochasticCollisionModel<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
+ Foam::StochasticCollisionModel<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 9098782204e0f5041d87f3724bd8bd2f0058c296..65a2506928401bf963591f219dd7a119459b5105 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -235,28 +235,31 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeSurfaceFilmModel(CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug \
- ( \
- SurfaceFilmModel<kinematicCloudType>, \
- 0 \
- ); \
- defineTemplateRunTimeSelectionTable \
- ( \
- SurfaceFilmModel<kinematicCloudType>, \
- dictionary \
- );
+#define makeSurfaceFilmModel(CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ ( \
+ Foam::SurfaceFilmModel<kinematicCloudType>, \
+ 0 \
+ ); \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ SurfaceFilmModel<kinematicCloudType>, \
+ dictionary \
+ ); \
+ }
-#define makeSurfaceFilmModelType(SS, CloudType) \
- \
- typedef CloudType::kinematicCloudType kinematicCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0); \
- \
- SurfaceFilmModel<kinematicCloudType>:: \
- adddictionaryConstructorToTable<SS<kinematicCloudType> > \
+#define makeSurfaceFilmModelType(SS, CloudType) \
+ \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<kinematicCloudType>, 0); \
+ \
+ Foam::SurfaceFilmModel<kinematicCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<kinematicCloudType> > \
add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
index 2c36126d8fa19a6949379bd73035f3d472e6c285..dac7edc27aa3d2e0749fda500f270e71c6af92a8 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/makeAveragingMethods.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,60 +31,87 @@ License
#include "Dual.H"
#include "Moment.H"
+// Scalar interpolation
+defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::scalar>, 0);
namespace Foam
{
- // Scalar interpolation
- defineNamedTemplateTypeNameAndDebug(AveragingMethod<scalar>, 0);
defineTemplateRunTimeSelectionTable
(
- AveragingMethod<scalar>,
+ AveragingMethod<Foam::scalar>,
dictionary
);
+}
- // Vector interpolation
- defineNamedTemplateTypeNameAndDebug(AveragingMethod<vector>, 0);
+// Vector interpolation
+defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod<Foam::vector>, 0);
+namespace Foam
+{
defineTemplateRunTimeSelectionTable
(
- AveragingMethod<vector>,
+ Foam::AveragingMethod<Foam::vector>,
dictionary
);
-
- namespace AveragingMethods
- {
- // Basic interpolation
- defineNamedTemplateTypeNameAndDebug(Basic<scalar>, 0);
- AveragingMethod<scalar>::
- adddictionaryConstructorToTable<Basic<scalar> >
- addBasicscalarConstructorToTable_;
-
- defineNamedTemplateTypeNameAndDebug(Basic<vector>, 0);
- AveragingMethod<vector>::
- adddictionaryConstructorToTable<Basic<vector> >
- addBasicvectorConstructorToTable_;
-
- // Dual interpolation
- defineNamedTemplateTypeNameAndDebug(Dual<scalar>, 0);
- AveragingMethod<scalar>::
- adddictionaryConstructorToTable<Dual<scalar> >
- addDualscalarConstructorToTable_;
-
- defineNamedTemplateTypeNameAndDebug(Dual<vector>, 0);
- AveragingMethod<vector>::
- adddictionaryConstructorToTable<Dual<vector> >
- addDualvectorConstructorToTable_;
-
- // Moment interpolation
- defineNamedTemplateTypeNameAndDebug(Moment<scalar>, 0);
- AveragingMethod<scalar>::
- adddictionaryConstructorToTable<Moment<scalar> >
- addMomentscalarConstructorToTable_;
-
- defineNamedTemplateTypeNameAndDebug(Moment<vector>, 0);
- AveragingMethod<vector>::
- adddictionaryConstructorToTable<Moment<vector> >
- addMomentvectorConstructorToTable_;
- }
}
+// Basic interpolation
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Basic<Foam::scalar>,
+ 0
+);
+Foam::AveragingMethod<Foam::scalar>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::scalar> >
+ addBasicscalarConstructorToTable_;
+
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Basic<Foam::vector>,
+ 0
+);
+Foam::AveragingMethod<Foam::vector>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Basic<Foam::vector> >
+ addBasicvectorConstructorToTable_;
+
+
+// Dual interpolation
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Dual<Foam::scalar>,
+ 0
+);
+Foam::AveragingMethod<Foam::scalar>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::scalar> >
+ addDualscalarConstructorToTable_;
+
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Dual<Foam::vector>,
+ 0
+);
+Foam::AveragingMethod<Foam::vector>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Dual<Foam::vector> >
+ addDualvectorConstructorToTable_;
+
+
+// Moment interpolation
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Moment<Foam::scalar>,
+ 0
+);
+Foam::AveragingMethod<Foam::scalar>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::scalar> >
+ addMomentscalarConstructorToTable_;
+
+defineNamedTemplateTypeNameAndDebug
+(
+ Foam::AveragingMethods::Moment<Foam::vector>,
+ 0
+);
+Foam::AveragingMethod<Foam::vector>::
+adddictionaryConstructorToTable<Foam::AveragingMethods::Moment<Foam::vector> >
+ addMomentvectorConstructorToTable_;
+
+
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
index 79edceeb9c6ef767b18902a45430711b4b783781..9c8e14293819702c3c9e6ef2c5a526aaf5e0ce3f 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -137,26 +137,32 @@ public:
#define makeDampingModel(CloudType) \
\
- typedef CloudType::MPPICCloudType MPPICCloudType; \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- DampingModel<MPPICCloudType>, \
+ Foam::DampingModel<MPPICCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- DampingModel<MPPICCloudType>, \
- dictionary \
- );
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ DampingModel<MPPICCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeDampingModelType(SS, CloudType) \
\
- typedef CloudType::MPPICCloudType MPPICCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::DampingModels::SS<MPPICCloudType>, 0); \
\
- DampingModel<MPPICCloudType>:: \
- adddictionaryConstructorToTable<SS<MPPICCloudType> > \
+ Foam::DampingModel<MPPICCloudType>:: \
+ adddictionaryConstructorToTable \
+ <Foam::DampingModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
index 103b748dc98a7364e969cd66011bc0aa1107b1de..3523effa8f8a65547c3f8e2418a1cbc60d6c372b 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/IsotropyModel/IsotropyModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -129,28 +129,34 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makeIsotropyModel(CloudType) \
- \
- typedef CloudType::MPPICCloudType MPPICCloudType; \
- defineNamedTemplateTypeNameAndDebug \
- ( \
- IsotropyModel<MPPICCloudType>, \
- 0 \
- ); \
- defineTemplateRunTimeSelectionTable \
- ( \
- IsotropyModel<MPPICCloudType>, \
- dictionary \
- );
-
-
-#define makeIsotropyModelType(SS, CloudType) \
- \
- typedef CloudType::MPPICCloudType MPPICCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
- \
- IsotropyModel<MPPICCloudType>:: \
- adddictionaryConstructorToTable<SS<MPPICCloudType> > \
+#define makeIsotropyModel(CloudType) \
+ \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ ( \
+ Foam::IsotropyModel<MPPICCloudType>, \
+ 0 \
+ ); \
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ IsotropyModel<MPPICCloudType>, \
+ dictionary \
+ ); \
+ }
+
+
+#define makeIsotropyModelType(SS, CloudType) \
+ \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::IsotropyModels::SS<MPPICCloudType>, 0); \
+ \
+ Foam::IsotropyModel<MPPICCloudType>:: \
+ adddictionaryConstructorToTable \
+ <Foam::IsotropyModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
index 6fcddbace16e4d5a71056ca5ec0e09584bbbb1a7..4258773a4922dc6aff464b4ab343e780f858dfb3 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/PackingModel/PackingModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -140,28 +140,34 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define makePackingModel(CloudType) \
- \
- typedef CloudType::MPPICCloudType MPPICCloudType; \
- defineNamedTemplateTypeNameAndDebug \
- ( \
- PackingModel<MPPICCloudType>, \
- 0 \
- ); \
- defineTemplateRunTimeSelectionTable \
- ( \
- PackingModel<MPPICCloudType>, \
- dictionary \
- );
-
-
-#define makePackingModelType(SS, CloudType) \
- \
- typedef CloudType::MPPICCloudType MPPICCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<MPPICCloudType>, 0); \
- \
- PackingModel<MPPICCloudType>:: \
- adddictionaryConstructorToTable<SS<MPPICCloudType> > \
+#define makePackingModel(CloudType) \
+ \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ ( \
+ Foam::PackingModel<MPPICCloudType>, \
+ 0 \
+ ); \
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ PackingModel<MPPICCloudType>, \
+ dictionary \
+ ); \
+ }
+
+
+#define makePackingModelType(SS, CloudType) \
+ \
+ typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::PackingModels::SS<MPPICCloudType>, 0); \
+ \
+ Foam::PackingModel<MPPICCloudType>:: \
+ adddictionaryConstructorToTable \
+ <Foam::PackingModels::SS<MPPICCloudType> > \
add##SS##CloudType##MPPICCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index c876286cc8c8a0330f118ca0866c1ae6a826cbdc..c786615bec52814958ac00636f7686a50a7ff140 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -283,26 +283,29 @@ public:
#define makeCompositionModel(CloudType) \
\
- typedef CloudType::reactingCloudType reactingCloudType; \
+ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- CompositionModel<reactingCloudType>, \
+ Foam::CompositionModel<reactingCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- CompositionModel<reactingCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ CompositionModel<reactingCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeCompositionModelType(SS, CloudType) \
\
- typedef CloudType::reactingCloudType reactingCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
+ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\
- CompositionModel<reactingCloudType>:: \
- adddictionaryConstructorToTable<SS<reactingCloudType> > \
+ Foam::CompositionModel<reactingCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index e2e868e7dab04893113546319c29209776086674..22947cab7d819fdae4223f7a55f79316087ce2b7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -209,26 +209,29 @@ public:
#define makePhaseChangeModel(CloudType) \
\
- typedef CloudType::reactingCloudType reactingCloudType; \
+ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- PhaseChangeModel<reactingCloudType>, \
+ Foam::PhaseChangeModel<reactingCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- PhaseChangeModel<reactingCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ PhaseChangeModel<reactingCloudType>, \
+ dictionary \
+ ); \
+ }
#define makePhaseChangeModelType(SS, CloudType) \
\
- typedef CloudType::reactingCloudType reactingCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<reactingCloudType>, 0); \
+ typedef Foam::CloudType::reactingCloudType reactingCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<reactingCloudType>, 0); \
\
- PhaseChangeModel<reactingCloudType>:: \
- adddictionaryConstructorToTable<SS<reactingCloudType> > \
+ Foam::PhaseChangeModel<reactingCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<reactingCloudType> > \
add##SS##CloudType##reactingCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 3db94c0023e29d842c1dcda4ab90681f7a87a1f1..41d0403cdd70028db92178dff1a550f1cfba9cc8 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -156,28 +156,33 @@ public:
#define makeDevolatilisationModel(CloudType) \
\
- typedef CloudType::reactingMultiphaseCloudType \
+ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- DevolatilisationModel<reactingMultiphaseCloudType>, \
+ Foam::DevolatilisationModel<reactingMultiphaseCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- DevolatilisationModel<reactingMultiphaseCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ DevolatilisationModel<reactingMultiphaseCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeDevolatilisationModelType(SS, CloudType) \
\
- typedef CloudType::reactingMultiphaseCloudType \
+ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::SS<reactingMultiphaseCloudType>, 0); \
\
- DevolatilisationModel<reactingMultiphaseCloudType>:: \
- adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
+ Foam::DevolatilisationModel<reactingMultiphaseCloudType>:: \
+ adddictionaryConstructorToTable \
+ <Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 446b01022e69357ea3f5880bc3874d402997a183..54892c4ba7d2192bbd3bfb2462213864dbf573cd 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -166,28 +166,33 @@ public:
#define makeSurfaceReactionModel(CloudType) \
\
- typedef CloudType::reactingMultiphaseCloudType \
+ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- SurfaceReactionModel<reactingMultiphaseCloudType>, \
+ Foam::SurfaceReactionModel<reactingMultiphaseCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- SurfaceReactionModel<reactingMultiphaseCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ SurfaceReactionModel<reactingMultiphaseCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeSurfaceReactionModelType(SS, CloudType) \
\
- typedef CloudType::reactingMultiphaseCloudType \
+ typedef Foam::CloudType::reactingMultiphaseCloudType \
reactingMultiphaseCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<reactingMultiphaseCloudType>, 0); \
+ defineNamedTemplateTypeNameAndDebug \
+ (Foam::SS<reactingMultiphaseCloudType>, 0); \
\
- SurfaceReactionModel<reactingMultiphaseCloudType>:: \
- adddictionaryConstructorToTable<SS<reactingMultiphaseCloudType> > \
+ Foam::SurfaceReactionModel<reactingMultiphaseCloudType>:: \
+ adddictionaryConstructorToTable \
+ <Foam::SS<reactingMultiphaseCloudType> > \
add##SS##CloudType##reactingMultiphaseCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index 3244007e336a8c8344182304eb4b89c5f480c768..70500e7e58ded0ff94ed8ff1d6c27a98a377ab21 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -155,26 +155,29 @@ public:
#define makeHeatTransferModel(CloudType) \
\
- typedef CloudType::thermoCloudType thermoCloudType; \
+ typedef Foam::CloudType::thermoCloudType thermoCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- HeatTransferModel<thermoCloudType>, \
+ Foam::HeatTransferModel<thermoCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- HeatTransferModel<thermoCloudType>, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ HeatTransferModel<thermoCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeHeatTransferModelType(SS, CloudType) \
\
- typedef CloudType::thermoCloudType thermoCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<thermoCloudType>, 0); \
+ typedef Foam::CloudType::thermoCloudType thermoCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<thermoCloudType>, 0); \
\
- HeatTransferModel<thermoCloudType>:: \
- adddictionaryConstructorToTable<SS<thermoCloudType> > \
+ Foam::HeatTransferModel<thermoCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<thermoCloudType> > \
add##SS##CloudType##thermoCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C b/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C
index 0430e33f91665506076f661bc559a5e8d4e103cd..51aafc76266e4cc6d823ad1ac7b97a67d12225dd 100644
--- a/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C
+++ b/src/lagrangian/spray/parcels/derived/basicSprayParcel/makeBasicSprayParcelSubmodels.C
@@ -51,32 +51,29 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeParcelCloudFunctionObjects(basicSprayCloud);
-
- // Kinematic sub-models
- makeThermoParcelForces(basicSprayCloud);
- makeThermoParcelTurbulenceForces(basicSprayCloud);
- makeParcelDispersionModels(basicSprayCloud);
- makeParcelTurbulenceDispersionModels(basicSprayCloud);
- makeSprayParcelInjectionModels(basicSprayCloud);
- makeParcelPatchInteractionModels(basicSprayCloud);
- makeSprayParcelStochasticCollisionModels(basicSprayCloud);
-
- // Thermo sub-models
- makeParcelHeatTransferModels(basicSprayCloud);
-
- // Reacting sub-models
- makeReactingParcelCompositionModels(basicSprayCloud);
- makeReactingParcelPhaseChangeModels(basicSprayCloud);
- makeReactingParcelSurfaceFilmModels(basicSprayCloud);
-
- // Spray sub-models
- makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud);
- makeSprayParcelAtomizationModels(basicSprayCloud);
- makeSprayParcelBreakupModels(basicSprayCloud);
-};
+makeParcelCloudFunctionObjects(basicSprayCloud);
+
+// Kinematic sub-models
+makeThermoParcelForces(basicSprayCloud);
+makeThermoParcelTurbulenceForces(basicSprayCloud);
+makeParcelDispersionModels(basicSprayCloud);
+makeParcelTurbulenceDispersionModels(basicSprayCloud);
+makeSprayParcelInjectionModels(basicSprayCloud);
+makeParcelPatchInteractionModels(basicSprayCloud);
+makeSprayParcelStochasticCollisionModels(basicSprayCloud);
+
+// Thermo sub-models
+makeParcelHeatTransferModels(basicSprayCloud);
+
+// Reacting sub-models
+makeReactingParcelCompositionModels(basicSprayCloud);
+makeReactingParcelPhaseChangeModels(basicSprayCloud);
+makeReactingParcelSurfaceFilmModels(basicSprayCloud);
+
+// Spray sub-models
+makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud);
+makeSprayParcelAtomizationModels(basicSprayCloud);
+makeSprayParcelBreakupModels(basicSprayCloud);
// ************************************************************************* //
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index fc8d4c03750c1e480ca9d9ab0ee3d62107aa41f8..58073f2f718703b713f4b3dd01edc75b153acf3d 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -152,26 +152,30 @@ public:
#define makeAtomizationModel(CloudType) \
\
- typedef CloudType::sprayCloudType sprayCloudType; \
+ typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- AtomizationModel<sprayCloudType>, \
+ Foam::AtomizationModel<sprayCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- AtomizationModel<sprayCloudType>, \
- dictionary \
- );
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ AtomizationModel<sprayCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeAtomizationModelType(SS, CloudType) \
\
- typedef CloudType::sprayCloudType sprayCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<sprayCloudType>, 0); \
+ typedef Foam::CloudType::sprayCloudType sprayCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0); \
\
- AtomizationModel<sprayCloudType>:: \
- adddictionaryConstructorToTable<SS<sprayCloudType> > \
+ Foam::AtomizationModel<sprayCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<sprayCloudType> > \
add##SS##CloudType##sprayCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index fdbd849b609b0fa3aa8aa58da7c77b31da06846b..a0546fe784ef21c313e3fb2e8b9bf66cb3772547 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -199,26 +199,30 @@ public:
#define makeBreakupModel(CloudType) \
\
- typedef CloudType::sprayCloudType sprayCloudType; \
+ typedef Foam::CloudType::sprayCloudType sprayCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- BreakupModel<sprayCloudType>, \
+ Foam::BreakupModel<sprayCloudType>, \
0 \
); \
- defineTemplateRunTimeSelectionTable \
- ( \
- BreakupModel<sprayCloudType>, \
- dictionary \
- );
+ \
+ namespace Foam \
+ { \
+ defineTemplateRunTimeSelectionTable \
+ ( \
+ BreakupModel<sprayCloudType>, \
+ dictionary \
+ ); \
+ }
#define makeBreakupModelType(SS, CloudType) \
\
- typedef CloudType::sprayCloudType sprayCloudType; \
- defineNamedTemplateTypeNameAndDebug(SS<sprayCloudType>, 0); \
+ typedef Foam::CloudType::sprayCloudType sprayCloudType; \
+ defineNamedTemplateTypeNameAndDebug(Foam::SS<sprayCloudType>, 0); \
\
- BreakupModel<sprayCloudType>:: \
- adddictionaryConstructorToTable<SS<sprayCloudType> > \
+ Foam::BreakupModel<sprayCloudType>:: \
+ adddictionaryConstructorToTable<Foam::SS<sprayCloudType> > \
add##SS##CloudType##sprayCloudType##ConstructorToTable_;
diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
index d2428ba4b23172e7d44407fdfc5f11cf3313be06..2ca6ac93baccb8b27dfa09afbf4c28d171a292a1 100644
--- a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
+++ b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
@@ -35,10 +35,10 @@ License
#define makeParcelTurbulenceDispersionModels(CloudType) \
\
- typedef CloudType::kinematicCloudType kinematicCloudType; \
+ typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
- DispersionRASModel<kinematicCloudType>, \
+ Foam::DispersionRASModel<kinematicCloudType>, \
0 \
); \
\
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C
index fba1827c8671c0e4cc51c38661c2ecd3f10108fb..0f6c482e01631039667ec183ce7bd6b130292aab 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C
@@ -28,20 +28,9 @@ License
#include "makeSootTypes.H"
#include "thermoPhysicsTypes.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace radiation
-{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makeSootTypesThermo(mixtureFractionSoot, gasHThermoPhysics);
makeSootTypesThermo(mixtureFractionSoot, gasEThermoPhysics);
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-} // End namespace radiation
-
// ************************************************************************* //
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
index 8e08b21b5040fb5cd454fb4dff6eec9619b8c135..4676b5efe73818b747da72758b19bf35c6e1a2bf 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/sootModel/makeSootTypes.H
@@ -32,8 +32,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSootTypesThermo(sootModelType, Thermo) \
- \
- typedef sootModelType<Thermo> sootModelType##Thermo; \
+ typedef Foam::radiation::sootModelType<Foam::Thermo> \
+ sootModelType##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
@@ -42,12 +42,20 @@ License
0 \
); \
\
- addToRunTimeSelectionTable \
- ( \
- sootModel, \
- sootModelType##Thermo, \
- dictionary \
- );
+ namespace Foam \
+ { \
+ namespace radiation \
+ { \
+ typedef sootModelType<Thermo> sootModelType##Thermo; \
+ \
+ addToRunTimeSelectionTable \
+ ( \
+ sootModel, \
+ sootModelType##Thermo, \
+ dictionary \
+ ); \
+ } \
+ }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C
index 85306aaf72a7f6dd80b23a66af570aa6f4e628cf..b8f99a91184f18aa9afc00534b2b1ec5e682c0c2 100644
--- a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C
+++ b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,34 +40,32 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
- makeSolidChemistryModel
- (
- solidChemistryModel,
- pyrolysisChemistryModel,
- basicSolidChemistryModel,
- hConstSolidThermoPhysics,
- gasHThermoPhysics
- );
+makeSolidChemistryModel
+(
+ solidChemistryModel,
+ pyrolysisChemistryModel,
+ basicSolidChemistryModel,
+ hConstSolidThermoPhysics,
+ gasHThermoPhysics
+);
- makeSolidChemistryModel
- (
- solidChemistryModel,
- pyrolysisChemistryModel,
- basicSolidChemistryModel,
- hExponentialSolidThermoPhysics,
- gasHThermoPhysics
- );
+makeSolidChemistryModel
+(
+ solidChemistryModel,
+ pyrolysisChemistryModel,
+ basicSolidChemistryModel,
+ hExponentialSolidThermoPhysics,
+ gasHThermoPhysics
+);
+
+makeSolidChemistryModel
+(
+ solidChemistryModel,
+ pyrolysisChemistryModel,
+ basicSolidChemistryModel,
+ hExpKappaConstSolidThermoPhysics,
+ gasHThermoPhysics
+);
- makeSolidChemistryModel
- (
- solidChemistryModel,
- pyrolysisChemistryModel,
- basicSolidChemistryModel,
- hExpKappaConstSolidThermoPhysics,
- gasHThermoPhysics
- );
-}
// ************************************************************************* //
diff --git a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
index f55698b4359f43d6dcd5a2d4a4feea6252847909..040f526082c8aaaf9d9e14fa0781231281a502da 100644
--- a/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
+++ b/src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,43 +29,36 @@ Description
#ifndef makeSolidChemistryModel_H
#define makeSolidChemistryModel_H
-#include "addToRunTimeSelectionTable.H"
#include "solidChemistryModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo, GThermo) \
\
- typedef SS<Comp, SThermo, GThermo> SS##Comp##SThermo##GThermo; \
+ typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo> \
+ SS##Comp##SThermo##GThermo; \
\
- typedef sChemistry<Comp, SThermo> sChemistryl##Comp##SThermo; \
+ typedef Foam::sChemistry<Foam::Comp, Foam::SThermo> \
+ sChemistryl##Comp##SThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
sChemistryl##Comp##SThermo, \
- (word(sChemistry::typeName_()) + "<"#Comp"," + SThermo::typeName() + \
- + ">").c_str(), \
+ (Foam::word(sChemistryl##Comp##SThermo::typeName_()) + "<"#Comp"," \
+ + SThermo::typeName() + ">").c_str(), \
0 \
); \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##SThermo##GThermo, \
- (word(SS::typeName_()) + "<"#Comp"," + SThermo::typeName() + "," + \
- GThermo::typeName() + ">").c_str(), \
+ (Foam::word(SS##Comp##SThermo##GThermo::typeName_()) + "<"#Comp"," \
+ + SThermo::typeName() + "," + GThermo::typeName() + ">").c_str(), \
0 \
);
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 1d6d2b041c551dd9299dfe26fa8ff9022595d90f..b4dd352444252e3f40d8f57d746da8651c66b031 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -1,10 +1,10 @@
SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
-c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
+c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
CC = clang++ -m64
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index cf3745790811d8fb111d6d9b244799d6eea93ad5..ab4226f7a6bf5af6fde339f10c0bcefb870c85be 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -1,10 +1,10 @@
SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
-c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags
+c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
CC = clang++ -m32