diff --git a/src/OpenFOAM/db/typeInfo/debugName.H b/src/OpenFOAM/db/typeInfo/debugName.H index 2277945ed..86c3d6693 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 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 Foam::AddToDebug::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 8eab80132..d84522096 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" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +defineTemplateTypeNameAndDebugWithName +( + Foam::compressible::constSolid_thermalBaffle1DFvPatchScalarField, + "compressible::thermalBaffle1D", + 0 +); + +defineTemplateTypeNameAndDebugWithName +( + Foam::compressible::expoSolid_thermalBaffle1DFvPatchScalarField, + "compressible::thermalBaffle1D", + 0 +); namespace Foam { namespace compressible { + addToPatchFieldRunTimeSelection + ( + fvPatchScalarField, + constSolid_thermalBaffle1DFvPatchScalarField + ); -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + addToPatchFieldRunTimeSelection + ( + fvPatchScalarField, + expoSolid_thermalBaffle1DFvPatchScalarField + ); +} +} -defineTemplateTypeNameAndDebugWithName -( - constSolid_thermalBaffle1DFvPatchScalarField, - "compressible::thermalBaffle1D", - 0 -); -addToPatchFieldRunTimeSelection -( - fvPatchScalarField, - constSolid_thermalBaffle1DFvPatchScalarField -); - -defineTemplateTypeNameAndDebugWithName -( - expoSolid_thermalBaffle1DFvPatchScalarField, - "compressible::thermalBaffle1D", - 0 -); - -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 ae0b0cb59..12839d7c6 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 > \ + Type##SType##BaseModel; \ + defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ + \ namespace Foam \ { \ namespace SType##Models \ { \ typedef Type > 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 cea2079b4..6088a71af 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, 0); \ + \ namespace Foam \ { \ namespace SType##Models \ { \ typedef Type 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 8b36ce8f8..1fff6a86e 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 - ); +// Combustion models based on sensibleEnthalpy +makeCombustionTypesThermo +( + FSD, + psiThermoCombustion, + gasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - psiThermoCombustion, - constGasHThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + FSD, + psiThermoCombustion, + constGasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - rhoThermoCombustion, - gasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + FSD, + rhoThermoCombustion, + gasHThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - rhoThermoCombustion, - constGasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + FSD, + rhoThermoCombustion, + constGasHThermoPhysics, + rhoCombustionModel +); - // Combustion models based on sensibleInternalEnergy - makeCombustionTypesThermo - ( - FSD, - psiThermoCombustion, - gasEThermoPhysics, - psiCombustionModel - ); +// Combustion models based on sensibleInternalEnergy +makeCombustionTypesThermo +( + FSD, + psiThermoCombustion, + gasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - psiThermoCombustion, - constGasEThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + FSD, + psiThermoCombustion, + constGasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - rhoThermoCombustion, - gasEThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + FSD, + rhoThermoCombustion, + gasEThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - FSD, - rhoThermoCombustion, - constGasEThermoPhysics, - rhoCombustionModel - ); -} -} +makeCombustionTypesThermo +( + FSD, + rhoThermoCombustion, + constGasEThermoPhysics, + rhoCombustionModel +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/combustionModels/PaSR/PaSRs.C b/src/combustionModels/PaSR/PaSRs.C index 24978b55c..0e52c3f0a 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 31f2e8400..4bf871d3b 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 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 \ + \ + CombModel##CombType##Thermo; \ + \ + defineTemplateTypeNameAndDebugWithName \ + ( \ + CombModel##CombType##Thermo, \ + #CombModel"<"#CombType","#Thermo">", \ + 0 \ + ); \ + \ + namespace Foam \ + { \ + namespace combustionModels \ + { \ + typedef CombModel CombModel##CombType##Thermo; \ + addToRunTimeSelectionTable \ + ( \ + Table, \ + CombModel##CombType##Thermo, \ + dictionary \ + ); \ + } \ + } -#define makeCombustionTypes(CombModel, CombType, Table) \ - \ - typedef CombModel CombModel##CombType; \ - \ - defineTemplateTypeNameAndDebugWithName \ - ( \ - CombModel##CombType, \ - #CombModel"<"#CombType">", \ - 0 \ - ); \ - \ - addToRunTimeSelectionTable \ - ( \ - Table, \ - CombModel##CombType, \ - dictionary \ - ); - +#define makeCombustionTypes(CombModel, CombType, Table) \ + \ + typedef Foam::combustionModels::CombModel \ + \ + CombModel##CombType; \ + \ + defineTemplateTypeNameAndDebugWithName \ + ( \ + CombModel##CombType, \ + #CombModel"<"#CombType">", \ + 0 \ + ); \ + \ + namespace Foam \ + { \ + namespace combustionModels \ + { \ + typedef CombModel CombModel##CombType; \ + \ + addToRunTimeSelectionTable \ + ( \ + Table, \ + CombModel##CombType, \ + dictionary \ + ); \ + } \ + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/combustionModels/diffusion/diffusions.C b/src/combustionModels/diffusion/diffusions.C index 1e08d210e..e358c96d3 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 - ); +// Combustion models based on sensibleEnthalpy +makeCombustionTypesThermo +( + diffusion, + psiThermoCombustion, + gasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - psiThermoCombustion, - constGasHThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + psiThermoCombustion, + constGasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - rhoThermoCombustion, - gasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + rhoThermoCombustion, + gasHThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - rhoThermoCombustion, - constGasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + rhoThermoCombustion, + constGasHThermoPhysics, + rhoCombustionModel +); - // Combustion models based on sensibleInternalEnergy + // Combustion models based on sensibleInternalEnergy - makeCombustionTypesThermo - ( - diffusion, - psiThermoCombustion, - gasEThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + psiThermoCombustion, + gasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - psiThermoCombustion, - constGasEThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + psiThermoCombustion, + constGasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - rhoThermoCombustion, - gasEThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + diffusion, + rhoThermoCombustion, + gasEThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - diffusion, - rhoThermoCombustion, - constGasEThermoPhysics, - rhoCombustionModel - ); -} -} +makeCombustionTypesThermo +( + diffusion, + rhoThermoCombustion, + constGasEThermoPhysics, + rhoCombustionModel +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistrys.C index c2c8b63e6..95e5a79d4 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 +// Combustion models based on sensibleEnthalpy - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - psiThermoCombustion, - gasHThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + psiThermoCombustion, + gasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - psiThermoCombustion, - constGasHThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + psiThermoCombustion, + constGasHThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - rhoThermoCombustion, - gasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + rhoThermoCombustion, + gasHThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - rhoThermoCombustion, - constGasHThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + rhoThermoCombustion, + constGasHThermoPhysics, + rhoCombustionModel +); - // Combustion models based on sensibleInternalEnergy +// Combustion models based on sensibleInternalEnergy - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - psiThermoCombustion, - gasEThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + psiThermoCombustion, + gasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - psiThermoCombustion, - constGasEThermoPhysics, - psiCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + psiThermoCombustion, + constGasEThermoPhysics, + psiCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - rhoThermoCombustion, - gasEThermoPhysics, - rhoCombustionModel - ); +makeCombustionTypesThermo +( + infinitelyFastChemistry, + rhoThermoCombustion, + gasEThermoPhysics, + rhoCombustionModel +); - makeCombustionTypesThermo - ( - infinitelyFastChemistry, - rhoThermoCombustion, - constGasEThermoPhysics, - rhoCombustionModel - ); -} -} +makeCombustionTypesThermo +( + infinitelyFastChemistry, + rhoThermoCombustion, + constGasEThermoPhysics, + rhoCombustionModel +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/combustionModels/laminar/laminars.C b/src/combustionModels/laminar/laminars.C index 1c7d5526c..73d400c09 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 b5a986b9e..516e5af82 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, + psiThermoCombustion, + psiCombustionModel +); - makeCombustionTypes - ( - noCombustion, - rhoThermoCombustion, - rhoCombustionModel - ); -} -} +makeCombustionTypes +( + noCombustion, + rhoThermoCombustion, + rhoCombustionModel +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionSchemes.C index 33385d4ec..c011a40e2 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 e871aec19..491ed4849 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -convectionScheme::addIstreamConstructorToTable > \ - add##SS##Type##IstreamConstructorToTable_; - + namespace Foam \ + { \ + namespace fv \ + { \ + convectionScheme::addIstreamConstructorToTable > \ + add##SS##Type##IstreamConstructorToTable_; \ + } \ + } #define makeFvConvectionScheme(SS) \ \ @@ -221,11 +225,17 @@ makeFvConvectionTypeScheme(SS, tensor) #define makeMultivariateFvConvectionTypeScheme(SS, Type) \ + defineNamedTemplateTypeNameAndDebug(Foam::fv::SS, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -convectionScheme::addMultivariateConstructorToTable > \ - add##SS##Type##MultivariateConstructorToTable_; + namespace Foam \ + { \ + namespace fv \ + { \ + convectionScheme:: \ + addMultivariateConstructorToTable > \ + 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 c5ea8dbac..65386824b 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) - ); +int Foam::fv::warnUnboundedGauss +( + Foam::debug::debugSwitch("warnUnboundedGauss", true) +); - makeFvConvectionScheme(gaussConvectionScheme) -} -} +makeFvConvectionScheme(gaussConvectionScheme) // ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C b/src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionSchemes.C index 6bc1ce34d..cfa0d039f 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 8711c4324..5b08cebdf 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 d7878191f..55e2fd21e 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -d2dt2Scheme::addIstreamConstructorToTable > \ - add##SS##Type##IstreamConstructorToTable_; - + namespace Foam \ + { \ + namespace fv \ + { \ + d2dt2Scheme::addIstreamConstructorToTable > \ + 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 7ef9837d0..418f5d59f 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 64a369e6e..3e7866ecc 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 3166243a9..e2ecc849a 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 6207a2b45..aa189acec 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 22c7b9a64..eb00cc439 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 97b2d39a5..e6f2a56dd 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 8971a237e..f600cd36a 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 dccf7f961..a8d4301c5 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -ddtScheme::addIstreamConstructorToTable > \ - add##SS##Type##IstreamConstructorToTable_; - + namespace Foam \ + { \ + namespace fv \ + { \ + ddtScheme::addIstreamConstructorToTable > \ + 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 SS::fvcDdtUfCorr \ ( \ @@ -316,6 +325,9 @@ tmp SS::fvcDdtPhiCorr \ { \ notImplemented(#SS"::fvcDdtPhiCorr"); \ return surfaceScalarField::null(); \ +} \ + \ +} \ } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtSchemes.C index 8fed9dfa5..45099e1a6 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 814b51bfa..80afc3a9a 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 b33792048..4032e2d5c 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -divScheme::addIstreamConstructorToTable > \ - add##SS##Type##IstreamConstructorToTable_; - + namespace Foam \ + { \ + namespace fv \ + { \ + divScheme::addIstreamConstructorToTable > \ + 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 bde36e2c6..2d25bb6b8 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 edc941846..a71d0e87a 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 LeastSquaresGrad##TYPE##STENCIL##_; \ -defineTemplateTypeNameAndDebugWithName \ - (LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \ - \ -gradScheme::addIstreamConstructorToTable \ - > \ - add##SS##STENCIL##TYPE##IstreamConstructorToTable_; +#define makeLeastSquaresGradTypeScheme(SS, STENCIL, TYPE) \ + typedef Foam::fv::LeastSquaresGrad \ + LeastSquaresGrad##TYPE##STENCIL##_; \ + \ + defineTemplateTypeNameAndDebugWithName \ + (LeastSquaresGrad##TYPE##STENCIL##_, #SS, 0); \ + \ + namespace Foam \ + { \ + namespace fv \ + { \ + typedef LeastSquaresGrad \ + LeastSquaresGrad##TYPE##STENCIL##_; \ + \ + gradScheme::addIstreamConstructorToTable \ + > \ + add##SS##STENCIL##TYPE##IstreamConstructorToTable_; \ + } \ + } -#define makeLeastSquaresGradScheme(SS, STENCIL) \ - \ -typedef LeastSquaresVectors LeastSquaresVectors##STENCIL##_; \ -defineTemplateTypeNameAndDebugWithName \ - (LeastSquaresVectors##STENCIL##_, #SS, 0); \ - \ -makeLeastSquaresGradTypeScheme(SS,STENCIL,scalar) \ -makeLeastSquaresGradTypeScheme(SS,STENCIL,vector) +#define makeLeastSquaresGradScheme(SS, STENCIL) \ + typedef Foam::fv::LeastSquaresVectors \ + 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 021e2da28..3b48f3fd5 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 +// ( +// faceCellsLeastSquares, +// centredCFCCellToCellStencilObject +// ) - makeLeastSquaresGradScheme - ( - pointCellsLeastSquares, - centredCPCCellToCellStencilObject - ) +makeLeastSquaresGradScheme +( + pointCellsLeastSquares, + centredCPCCellToCellStencilObject +) - makeLeastSquaresGradScheme - ( - edgeCellsLeastSquares, - centredCECCellToCellStencilObject - ) -} -} +makeLeastSquaresGradScheme +( + edgeCellsLeastSquares, + centredCECCellToCellStencilObject +) // ************************************************************************* // diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrads.C index 2f385c715..704405974 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 9a6d1e81c..f395adaa9 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 ce1e90d34..aa508ab8b 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -gradScheme::addIstreamConstructorToTable > \ - add##SS##Type##IstreamConstructorToTable_; + namespace Foam \ + { \ + namespace fv \ + { \ + gradScheme::addIstreamConstructorToTable > \ + 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 8c1cfe08e..2f44144d0 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 566b81304..14064aa9e 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 75649ec0d..594ad63dd 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 5b25f5820..c37b14a29 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 4006fd5e7..9a43689fd 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 fd983f375..b7c2e25b8 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 529e55bdb..781d2044d 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 SS##Type##GType; \ + typedef Foam::fv::SS SS##Type##GType; \ defineNamedTemplateTypeNameAndDebug(SS##Type##GType, 0); \ \ - laplacianScheme:: \ - addIstreamConstructorToTable > \ - add##SS##Type##GType##IstreamConstructorToTable_; + namespace Foam \ + { \ + namespace fv \ + { \ + typedef SS SS##Type##GType; \ + \ + laplacianScheme:: \ + addIstreamConstructorToTable > \ + 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 d92478c31..4cebfa3e7 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 \ - CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \ -defineTemplateTypeNameAndDebugWithName \ - (CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \ - \ -snGradScheme::addMeshConstructorToTable \ - > \ - add##SS##STENCIL##TYPE##MeshConstructorToTable_; +#define makeCentredFitSnGradTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \ + typedef Foam::fv::CentredFitSnGradScheme \ + \ + CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_; \ + \ + defineTemplateTypeNameAndDebugWithName \ + (CentredFitSnGradScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0); \ + \ + namespace Foam \ + { \ + namespace fv \ + { \ + snGradScheme::addMeshConstructorToTable \ + > \ + add##SS##STENCIL##TYPE##MeshConstructorToTable_; \ + } \ + } -#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \ - \ -makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \ -makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \ -makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \ -makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \ -makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor) +#define makeCentredFitSnGradScheme(SS, POLYNOMIAL, STENCIL) \ + \ + makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,scalar) \ + makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,vector) \ + makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \ + makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \ + makeCentredFitSnGradTypeScheme(SS,POLYNOMIAL,STENCIL,tensor) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrads.C index fee7bfca2..08906fd48 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 diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrads.C index ba6d83542..73ba877fd 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 1ed8ebe5f..177762a11 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 4335cc8e6..1354c582b 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, 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 4597bb43f..dda3b6bd6 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 63e4ea98f..40cf5ae54 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, 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 8452a907a..e507cc837 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, 0); \ \ -defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ -snGradScheme::addMeshConstructorToTable > \ - add##SS##Type##MeshConstructorToTable_; + namespace Foam \ + { \ + namespace fv \ + { \ + snGradScheme::addMeshConstructorToTable > \ + 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 161244a4c..458fe1011 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 d3420bef8..2e4dea145 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 8900f4d34..bb4c686a4 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, \ + Foam::fv::Option, \ #Type#Option, \ 0 \ ); \ \ - option::adddictionaryConstructorToTable > \ + Foam::fv::option::adddictionaryConstructorToTable \ + > \ add##Option##Type##dictionary##ConstructorTooptionTable_ diff --git a/src/fvOptions/sources/general/codedSource/codedSource.C b/src/fvOptions/sources/general/codedSource/codedSource.C index 654caa7c2..05ec6d240 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 0fb667ff0..b8ae80076 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 d2428ba4b..2ca6ac93b 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, \ + Foam::DispersionRASModel, \ 0 \ ); \ \ diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C index b07c64638..8012c20e3 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); +makeParcelCloudFunctionObjects(basicKinematicCollidingCloud); - // Kinematic sub-models - makeParcelForces(basicKinematicCollidingCloud); - makeParcelDispersionModels(basicKinematicCollidingCloud); - makeParcelInjectionModels(basicKinematicCollidingCloud); - makeParcelCollisionModels(basicKinematicCollidingCloud); - makeParcelPatchInteractionModels(basicKinematicCollidingCloud); - makeParcelStochasticCollisionModels(basicKinematicCollidingCloud); - makeParcelSurfaceFilmModels(basicKinematicCollidingCloud); -} +// Kinematic sub-models +makeParcelForces(basicKinematicCollidingCloud); +makeParcelDispersionModels(basicKinematicCollidingCloud); +makeParcelInjectionModels(basicKinematicCollidingCloud); +makeParcelCollisionModels(basicKinematicCollidingCloud); +makeParcelPatchInteractionModels(basicKinematicCollidingCloud); +makeParcelStochasticCollisionModels(basicKinematicCollidingCloud); +makeParcelSurfaceFilmModels(basicKinematicCollidingCloud); // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicMPPICParcel/makeBasicKinematicMPPICParcelSubmodels.C index 735c21f3e..b15bc07b4 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 1aaa9590f..5969a45f0 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); +makeParcelCloudFunctionObjects(basicKinematicCloud); - // Kinematic sub-models - makeParcelForces(basicKinematicCloud); - makeParcelDispersionModels(basicKinematicCloud); - makeParcelInjectionModels(basicKinematicCloud); - makeParcelPatchInteractionModels(basicKinematicCloud); - makeParcelStochasticCollisionModels(basicKinematicCloud); - makeParcelSurfaceFilmModels(basicKinematicCloud); -} +// Kinematic sub-models +makeParcelForces(basicKinematicCloud); +makeParcelDispersionModels(basicKinematicCloud); +makeParcelInjectionModels(basicKinematicCloud); +makeParcelPatchInteractionModels(basicKinematicCloud); +makeParcelStochasticCollisionModels(basicKinematicCloud); +makeParcelSurfaceFilmModels(basicKinematicCloud); // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C index bafe2cdd2..e5688944d 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); +makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud); - // Kinematic sub-models - makeThermoParcelForces(basicReactingMultiphaseCloud); - makeParcelDispersionModels(basicReactingMultiphaseCloud); - makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud); - makeParcelPatchInteractionModels(basicReactingMultiphaseCloud); - makeReactingMultiphaseParcelStochasticCollisionModels - ( - basicReactingMultiphaseCloud - ); - makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud); +// Kinematic sub-models +makeThermoParcelForces(basicReactingMultiphaseCloud); +makeParcelDispersionModels(basicReactingMultiphaseCloud); +makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud); +makeParcelPatchInteractionModels(basicReactingMultiphaseCloud); +makeReactingMultiphaseParcelStochasticCollisionModels +( + basicReactingMultiphaseCloud +); +makeReactingParcelSurfaceFilmModels(basicReactingMultiphaseCloud); - // Thermo sub-models - makeParcelHeatTransferModels(basicReactingMultiphaseCloud); +// Thermo sub-models +makeParcelHeatTransferModels(basicReactingMultiphaseCloud); - // Reacting sub-models - makeReactingMultiphaseParcelCompositionModels - ( - basicReactingMultiphaseCloud - ); - makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud); +// Reacting sub-models +makeReactingMultiphaseParcelCompositionModels +( + basicReactingMultiphaseCloud +); +makeReactingParcelPhaseChangeModels(basicReactingMultiphaseCloud); - // Reacting multiphase sub-models - makeReactingMultiphaseParcelDevolatilisationModels - ( - basicReactingMultiphaseCloud - ); - makeReactingMultiphaseParcelSurfaceReactionModels - ( - basicReactingMultiphaseCloud - ); -} +// Reacting multiphase sub-models +makeReactingMultiphaseParcelDevolatilisationModels +( + basicReactingMultiphaseCloud +); +makeReactingMultiphaseParcelSurfaceReactionModels +( + basicReactingMultiphaseCloud +); // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C index e9eb87a2c..97e58ffe3 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); +makeParcelCloudFunctionObjects(basicReactingCloud); - // Kinematic sub-models - makeThermoParcelForces(basicReactingCloud); - makeParcelDispersionModels(basicReactingCloud); - makeReactingParcelInjectionModels(basicReactingCloud); - makeParcelPatchInteractionModels(basicReactingCloud); - makeParcelStochasticCollisionModels(basicReactingCloud); - makeReactingParcelSurfaceFilmModels(basicReactingCloud); +// Kinematic sub-models +makeThermoParcelForces(basicReactingCloud); +makeParcelDispersionModels(basicReactingCloud); +makeReactingParcelInjectionModels(basicReactingCloud); +makeParcelPatchInteractionModels(basicReactingCloud); +makeParcelStochasticCollisionModels(basicReactingCloud); +makeReactingParcelSurfaceFilmModels(basicReactingCloud); - // Thermo sub-models - makeParcelHeatTransferModels(basicReactingCloud); +// Thermo sub-models +makeParcelHeatTransferModels(basicReactingCloud); - // Reacting sub-models - makeReactingParcelCompositionModels(basicReactingCloud); - makeReactingParcelPhaseChangeModels(basicReactingCloud); -} +// Reacting sub-models +makeReactingParcelCompositionModels(basicReactingCloud); +makeReactingParcelPhaseChangeModels(basicReactingCloud); // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C index ba6d30bb9..71f2c085b 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); +makeParcelCloudFunctionObjects(basicThermoCloud); - // Kinematic sub-models - makeThermoParcelForces(basicThermoCloud); - makeParcelDispersionModels(basicThermoCloud); - makeParcelInjectionModels(basicThermoCloud); - makeParcelPatchInteractionModels(basicThermoCloud); - makeParcelStochasticCollisionModels(basicThermoCloud); - makeParcelSurfaceFilmModels(basicThermoCloud); +// Kinematic sub-models +makeThermoParcelForces(basicThermoCloud); +makeParcelDispersionModels(basicThermoCloud); +makeParcelInjectionModels(basicThermoCloud); +makeParcelPatchInteractionModels(basicThermoCloud); +makeParcelStochasticCollisionModels(basicThermoCloud); +makeParcelSurfaceFilmModels(basicThermoCloud); - // Thermo sub-models - makeParcelHeatTransferModels(basicThermoCloud); -} +// Thermo sub-models +makeParcelHeatTransferModels(basicThermoCloud); // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H b/src/lagrangian/intermediate/parcels/include/makeMPPICParcelDampingModels.H index 9513a59cc..61011a66a 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 eebab863e..0780a03d6 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 2a57875b4..cdcbf17aa 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 e949d6e0a..d66115565 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 d5b9369df..616e6314b 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, \ - 0 \ - ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - CloudFunctionObject, \ - dictionary \ - ); +#define makeCloudFunctionObject(CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + Foam::CloudFunctionObject, \ + 0 \ + ); \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + CloudFunctionObject, \ + dictionary \ + ); \ + } -#define makeCloudFunctionObjectType(SS, CloudType) \ - \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ - CloudFunctionObject:: \ - adddictionaryConstructorToTable > \ +#define makeCloudFunctionObjectType(SS, CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ + \ + Foam::CloudFunctionObject:: \ + adddictionaryConstructorToTable > \ 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 dfaf223a8..ff92ce44c 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, \ + Foam::CollisionModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - CollisionModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + CollisionModel, \ + dictionary \ + ); \ + } #define makeCollisionModelType(SS, CloudType) \ \ - typedef CloudType::collidingCloudType collidingCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::collidingCloudType collidingCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - CollisionModel:: \ - adddictionaryConstructorToTable > \ + Foam::CollisionModel:: \ + adddictionaryConstructorToTable > \ 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 cd44be846..1be43b508 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, 0); \ + defineNamedTemplateTypeNameAndDebug(Foam::PairModel, 0); \ \ - defineTemplateRunTimeSelectionTable \ - ( \ - PairModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + PairModel, \ + dictionary \ + ); \ + } #define makePairModelType(SS, CloudType) \ \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - PairModel::adddictionaryConstructorToTable > \ + Foam::PairModel:: \ + adddictionaryConstructorToTable > \ 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 f2b954b8d..93ff310ba 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, 0); \ + defineNamedTemplateTypeNameAndDebug(Foam::WallModel, 0); \ \ - defineTemplateRunTimeSelectionTable \ - ( \ - WallModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + WallModel, \ + dictionary \ + ); \ + } #define makeWallModelType(SS, CloudType) \ \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - WallModel::adddictionaryConstructorToTable > \ - add##SS##CloudType##ConstructorToTable_; + Foam::WallModel:: \ + adddictionaryConstructorToTable > \ + 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 323b85390..7e85e0eb2 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, 0); \ - defineTemplateRunTimeSelectionTable \ - ( \ - DispersionModel, \ - dictionary \ - ); - + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineTemplateTypeNameAndDebug \ + (Foam::DispersionModel, 0); \ + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + DispersionModel, \ + dictionary \ + ); \ + } #define makeDispersionModelType(SS, CloudType) \ \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - DispersionModel:: \ - adddictionaryConstructorToTable > \ + Foam::DispersionModel:: \ + adddictionaryConstructorToTable > \ 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 d9b8505bb..b44039633 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, \ + Foam::InjectionModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - InjectionModel, \ - dictionary \ - ); + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + InjectionModel, \ + dictionary \ + ); \ + } #define makeInjectionModelType(SS, CloudType) \ \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - InjectionModel:: \ - adddictionaryConstructorToTable > \ - add##SS##CloudType##kinematicCloudType##ConstructorToTable_; + Foam::InjectionModel:: \ + adddictionaryConstructorToTable > \ + 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 a72abc321..c2ef62d53 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, 0);\ - defineTemplateRunTimeSelectionTable \ - ( \ - ParticleForce, \ - dictionary \ - ); +#define makeParticleForceModel(CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::ParticleForce, 0); \ + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + ParticleForce, \ + dictionary \ + ); \ + } -#define makeParticleForceModelType(SS, CloudType) \ - \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ - ParticleForce:: \ - adddictionaryConstructorToTable > \ - add##SS##CloudType##kinematicCloudType##ConstructorToTable_; +#define makeParticleForceModelType(SS, CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ + \ + Foam::ParticleForce:: \ + adddictionaryConstructorToTable > \ + 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 cd94e369d..bfc4ae277 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, \ + Foam::PatchInteractionModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - PatchInteractionModel, \ - dictionary \ - ); + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + PatchInteractionModel, \ + dictionary \ + ); \ + } #define makePatchInteractionModelType(SS, CloudType) \ \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - PatchInteractionModel:: \ - adddictionaryConstructorToTable > \ + Foam::PatchInteractionModel:: \ + adddictionaryConstructorToTable > \ 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 b7f864194..823a458ae 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, \ - 0 \ - ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - StochasticCollisionModel, \ - dictionary \ - ); +#define makeStochasticCollisionModel(CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + Foam::StochasticCollisionModel, \ + 0 \ + ); \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + StochasticCollisionModel, \ + dictionary \ + ); \ + } #define makeStochasticCollisionModelType(SS, CloudType) \ \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - StochasticCollisionModel:: \ - adddictionaryConstructorToTable > \ + Foam::StochasticCollisionModel:: \ + adddictionaryConstructorToTable > \ 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 909878220..65a250692 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, \ - 0 \ - ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - SurfaceFilmModel, \ - dictionary \ - ); +#define makeSurfaceFilmModel(CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + Foam::SurfaceFilmModel, \ + 0 \ + ); \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + SurfaceFilmModel, \ + dictionary \ + ); \ + } -#define makeSurfaceFilmModelType(SS, CloudType) \ - \ - typedef CloudType::kinematicCloudType kinematicCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ - SurfaceFilmModel:: \ - adddictionaryConstructorToTable > \ +#define makeSurfaceFilmModelType(SS, CloudType) \ + \ + typedef Foam::CloudType::kinematicCloudType kinematicCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ + \ + Foam::SurfaceFilmModel:: \ + adddictionaryConstructorToTable > \ 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 2c36126d8..dac7edc27 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, 0); namespace Foam { - // Scalar interpolation - defineNamedTemplateTypeNameAndDebug(AveragingMethod, 0); defineTemplateRunTimeSelectionTable ( - AveragingMethod, + AveragingMethod, dictionary ); +} - // Vector interpolation - defineNamedTemplateTypeNameAndDebug(AveragingMethod, 0); +// Vector interpolation +defineNamedTemplateTypeNameAndDebug(Foam::AveragingMethod, 0); +namespace Foam +{ defineTemplateRunTimeSelectionTable ( - AveragingMethod, + Foam::AveragingMethod, dictionary ); - - namespace AveragingMethods - { - // Basic interpolation - defineNamedTemplateTypeNameAndDebug(Basic, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addBasicscalarConstructorToTable_; - - defineNamedTemplateTypeNameAndDebug(Basic, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addBasicvectorConstructorToTable_; - - // Dual interpolation - defineNamedTemplateTypeNameAndDebug(Dual, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addDualscalarConstructorToTable_; - - defineNamedTemplateTypeNameAndDebug(Dual, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addDualvectorConstructorToTable_; - - // Moment interpolation - defineNamedTemplateTypeNameAndDebug(Moment, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addMomentscalarConstructorToTable_; - - defineNamedTemplateTypeNameAndDebug(Moment, 0); - AveragingMethod:: - adddictionaryConstructorToTable > - addMomentvectorConstructorToTable_; - } } +// Basic interpolation +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Basic, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addBasicscalarConstructorToTable_; + +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Basic, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addBasicvectorConstructorToTable_; + + +// Dual interpolation +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Dual, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addDualscalarConstructorToTable_; + +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Dual, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addDualvectorConstructorToTable_; + + +// Moment interpolation +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Moment, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addMomentscalarConstructorToTable_; + +defineNamedTemplateTypeNameAndDebug +( + Foam::AveragingMethods::Moment, + 0 +); +Foam::AveragingMethod:: +adddictionaryConstructorToTable > + addMomentvectorConstructorToTable_; + + // ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H b/src/lagrangian/intermediate/submodels/MPPIC/DampingModels/DampingModel/DampingModel.H index 79edceeb9..9c8e14293 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, \ + Foam::DampingModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - DampingModel, \ - dictionary \ - ); + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + DampingModel, \ + dictionary \ + ); \ + } #define makeDampingModelType(SS, CloudType) \ \ - typedef CloudType::MPPICCloudType MPPICCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::DampingModels::SS, 0); \ \ - DampingModel:: \ - adddictionaryConstructorToTable > \ + Foam::DampingModel:: \ + adddictionaryConstructorToTable \ + > \ 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 103b748dc..3523effa8 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, \ - 0 \ - ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - IsotropyModel, \ - dictionary \ - ); +#define makeIsotropyModel(CloudType) \ + \ + typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + Foam::IsotropyModel, \ + 0 \ + ); \ + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + IsotropyModel, \ + dictionary \ + ); \ + } -#define makeIsotropyModelType(SS, CloudType) \ - \ - typedef CloudType::MPPICCloudType MPPICCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ - IsotropyModel:: \ - adddictionaryConstructorToTable > \ +#define makeIsotropyModelType(SS, CloudType) \ + \ + typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::IsotropyModels::SS, 0); \ + \ + Foam::IsotropyModel:: \ + adddictionaryConstructorToTable \ + > \ 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 6fcddbace..4258773a4 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, \ - 0 \ - ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - PackingModel, \ - dictionary \ - ); +#define makePackingModel(CloudType) \ + \ + typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + Foam::PackingModel, \ + 0 \ + ); \ + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + PackingModel, \ + dictionary \ + ); \ + } -#define makePackingModelType(SS, CloudType) \ - \ - typedef CloudType::MPPICCloudType MPPICCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ - \ - PackingModel:: \ - adddictionaryConstructorToTable > \ +#define makePackingModelType(SS, CloudType) \ + \ + typedef Foam::CloudType::MPPICCloudType MPPICCloudType; \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::PackingModels::SS, 0); \ + \ + Foam::PackingModel:: \ + adddictionaryConstructorToTable \ + > \ 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 c876286cc..c786615be 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, \ + Foam::CompositionModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - CompositionModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + CompositionModel, \ + dictionary \ + ); \ + } #define makeCompositionModelType(SS, CloudType) \ \ - typedef CloudType::reactingCloudType reactingCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::reactingCloudType reactingCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - CompositionModel:: \ - adddictionaryConstructorToTable > \ + Foam::CompositionModel:: \ + adddictionaryConstructorToTable > \ 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 e2e868e7d..22947cab7 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, \ + Foam::PhaseChangeModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - PhaseChangeModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + PhaseChangeModel, \ + dictionary \ + ); \ + } #define makePhaseChangeModelType(SS, CloudType) \ \ - typedef CloudType::reactingCloudType reactingCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::reactingCloudType reactingCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - PhaseChangeModel:: \ - adddictionaryConstructorToTable > \ + Foam::PhaseChangeModel:: \ + adddictionaryConstructorToTable > \ 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 3db94c002..41d0403cd 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, \ + Foam::DevolatilisationModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - DevolatilisationModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + DevolatilisationModel, \ + dictionary \ + ); \ + } #define makeDevolatilisationModelType(SS, CloudType) \ \ - typedef CloudType::reactingMultiphaseCloudType \ + typedef Foam::CloudType::reactingMultiphaseCloudType \ reactingMultiphaseCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::SS, 0); \ \ - DevolatilisationModel:: \ - adddictionaryConstructorToTable > \ + Foam::DevolatilisationModel:: \ + adddictionaryConstructorToTable \ + > \ 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 446b01022..54892c4ba 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, \ + Foam::SurfaceReactionModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - SurfaceReactionModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + SurfaceReactionModel, \ + dictionary \ + ); \ + } #define makeSurfaceReactionModelType(SS, CloudType) \ \ - typedef CloudType::reactingMultiphaseCloudType \ + typedef Foam::CloudType::reactingMultiphaseCloudType \ reactingMultiphaseCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + defineNamedTemplateTypeNameAndDebug \ + (Foam::SS, 0); \ \ - SurfaceReactionModel:: \ - adddictionaryConstructorToTable > \ + Foam::SurfaceReactionModel:: \ + adddictionaryConstructorToTable \ + > \ 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 3244007e3..70500e7e5 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, \ + Foam::HeatTransferModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - HeatTransferModel, \ - dictionary \ - ); + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + HeatTransferModel, \ + dictionary \ + ); \ + } #define makeHeatTransferModelType(SS, CloudType) \ \ - typedef CloudType::thermoCloudType thermoCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::thermoCloudType thermoCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - HeatTransferModel:: \ - adddictionaryConstructorToTable > \ + Foam::HeatTransferModel:: \ + adddictionaryConstructorToTable > \ 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 0430e33f9..51aafc762 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); +makeParcelCloudFunctionObjects(basicSprayCloud); - // Kinematic sub-models - makeThermoParcelForces(basicSprayCloud); - makeThermoParcelTurbulenceForces(basicSprayCloud); - makeParcelDispersionModels(basicSprayCloud); - makeParcelTurbulenceDispersionModels(basicSprayCloud); - makeSprayParcelInjectionModels(basicSprayCloud); - makeParcelPatchInteractionModels(basicSprayCloud); - makeSprayParcelStochasticCollisionModels(basicSprayCloud); +// Kinematic sub-models +makeThermoParcelForces(basicSprayCloud); +makeThermoParcelTurbulenceForces(basicSprayCloud); +makeParcelDispersionModels(basicSprayCloud); +makeParcelTurbulenceDispersionModels(basicSprayCloud); +makeSprayParcelInjectionModels(basicSprayCloud); +makeParcelPatchInteractionModels(basicSprayCloud); +makeSprayParcelStochasticCollisionModels(basicSprayCloud); - // Thermo sub-models - makeParcelHeatTransferModels(basicSprayCloud); +// Thermo sub-models +makeParcelHeatTransferModels(basicSprayCloud); - // Reacting sub-models - makeReactingParcelCompositionModels(basicSprayCloud); - makeReactingParcelPhaseChangeModels(basicSprayCloud); - makeReactingParcelSurfaceFilmModels(basicSprayCloud); +// Reacting sub-models +makeReactingParcelCompositionModels(basicSprayCloud); +makeReactingParcelPhaseChangeModels(basicSprayCloud); +makeReactingParcelSurfaceFilmModels(basicSprayCloud); - // Spray sub-models - makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud); - makeSprayParcelAtomizationModels(basicSprayCloud); - makeSprayParcelBreakupModels(basicSprayCloud); -}; +// Spray sub-models +makeParticleForceModelType(DistortedSphereDragForce, basicSprayCloud); +makeSprayParcelAtomizationModels(basicSprayCloud); +makeSprayParcelBreakupModels(basicSprayCloud); // ************************************************************************* // diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H index fc8d4c037..58073f2f7 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, \ + Foam::AtomizationModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - AtomizationModel, \ - dictionary \ - ); + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + AtomizationModel, \ + dictionary \ + ); \ + } #define makeAtomizationModelType(SS, CloudType) \ \ - typedef CloudType::sprayCloudType sprayCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::sprayCloudType sprayCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - AtomizationModel:: \ - adddictionaryConstructorToTable > \ + Foam::AtomizationModel:: \ + adddictionaryConstructorToTable > \ 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 fdbd849b6..a0546fe78 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, \ + Foam::BreakupModel, \ 0 \ ); \ - defineTemplateRunTimeSelectionTable \ - ( \ - BreakupModel, \ - dictionary \ - ); + \ + namespace Foam \ + { \ + defineTemplateRunTimeSelectionTable \ + ( \ + BreakupModel, \ + dictionary \ + ); \ + } #define makeBreakupModelType(SS, CloudType) \ \ - typedef CloudType::sprayCloudType sprayCloudType; \ - defineNamedTemplateTypeNameAndDebug(SS, 0); \ + typedef Foam::CloudType::sprayCloudType sprayCloudType; \ + defineNamedTemplateTypeNameAndDebug(Foam::SS, 0); \ \ - BreakupModel:: \ - adddictionaryConstructorToTable > \ + Foam::BreakupModel:: \ + adddictionaryConstructorToTable > \ add##SS##CloudType##sprayCloudType##ConstructorToTable_; diff --git a/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/turbulence/parcels/include/makeParcelTurbulenceDispersionModels.H index d2428ba4b..2ca6ac93b 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, \ + Foam::DispersionRASModel, \ 0 \ ); \ \ diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoots.C index fba1827c8..0f6c482e0 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 8e08b21b5..4676b5efe 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 sootModelType##Thermo; \ + typedef Foam::radiation::sootModelType \ + sootModelType##Thermo; \ \ defineTemplateTypeNameAndDebugWithName \ ( \ @@ -42,12 +42,20 @@ License 0 \ ); \ \ - addToRunTimeSelectionTable \ - ( \ - sootModel, \ - sootModelType##Thermo, \ - dictionary \ - ); + namespace Foam \ + { \ + namespace radiation \ + { \ + typedef sootModelType sootModelType##Thermo; \ + \ + addToRunTimeSelectionTable \ + ( \ + sootModel, \ + sootModelType##Thermo, \ + dictionary \ + ); \ + } \ + } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C b/src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C index 85306aaf7..b8f99a911 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 f55698b43..040f52608 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 SS##Comp##SThermo##GThermo; \ + typedef Foam::SS \ + SS##Comp##SThermo##GThermo; \ \ - typedef sChemistry sChemistryl##Comp##SThermo; \ + typedef Foam::sChemistry \ + 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 1d6d2b041..b4dd35244 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 cf3745790..ab4226f7a 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