Commit da439f54 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: consistent naming for templated/non-templated patch field construction

eg,
    - makePatchTypeField -> makeTemplatePatchTypeField
    - makeNonTemplatedPatchTypeField -> makePatchTypeField
parent 18dbe999
......@@ -217,7 +217,7 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
smoluchowskiJumpTFvPatchScalarField
......
......@@ -198,7 +198,7 @@ void maxwellSlipUFvPatchVectorField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
maxwellSlipUFvPatchVectorField
......
......@@ -112,7 +112,7 @@ void fixedRhoFvPatchScalarField::updateCoeffs()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
fixedRhoFvPatchScalarField
......
......@@ -203,7 +203,7 @@ void Foam::solidWallHeatFluxTemperatureFvPatchScalarField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
solidWallHeatFluxTemperatureFvPatchScalarField
......
......@@ -121,7 +121,7 @@ void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
adjointOutletPressureFvPatchScalarField
......
......@@ -119,7 +119,7 @@ void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
adjointOutletVelocityFvPatchVectorField
......
......@@ -133,7 +133,7 @@ void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
alphaContactAngleFvPatchScalarField
......
......@@ -207,7 +207,7 @@ void tractionDisplacementFvPatchVectorField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
tractionDisplacementFvPatchVectorField
......
......@@ -194,7 +194,7 @@ void tractionDisplacementCorrectionFvPatchVectorField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
tractionDisplacementCorrectionFvPatchVectorField
......
......@@ -500,20 +500,7 @@ const pointPatchField<Type>& operator+
#endif
#define makePointPatchTypeFieldTypeName(type) \
defineNamedTemplateTypeNameAndDebug(type, 0);
#define makePointPatchFieldsTypeName(type) \
makePointPatchTypeFieldTypeName(type##PointPatchScalarField); \
makePointPatchTypeFieldTypeName(type##PointPatchVectorField); \
makePointPatchTypeFieldTypeName(type##PointPatchSphericalTensorField); \
makePointPatchTypeFieldTypeName(type##PointPatchSymmTensorField); \
makePointPatchTypeFieldTypeName(type##PointPatchTensorField);
#define addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \
\
addToRunTimeSelectionTable \
( \
PatchTypeField, \
......@@ -533,46 +520,58 @@ const pointPatchField<Type>& operator+
dictionary \
);
// for non-templated patch fields
#define makeNonTemplatedPointPatchTypeField(PatchTypeField,typePatchTypeField)\
#define makePointPatchTypeField(PatchTypeField,typePatchTypeField) \
defineTypeNameAndDebug(typePatchTypeField, 0); \
addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
// for templated patch fields
#define makePointPatchTypeField(PatchTypeField, typePatchTypeField) \
#define makeTemplatePointPatchTypeField(PatchTypeField, typePatchTypeField) \
defineNamedTemplateTypeNameAndDebug(typePatchTypeField, 0); \
addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField)
#define makePointPatchFields(type) \
makePointPatchTypeField \
makeTemplatePointPatchTypeField \
( \
pointPatchScalarField, \
type##PointPatchScalarField \
); \
makePointPatchTypeField \
makeTemplatePointPatchTypeField \
( \
pointPatchVectorField, \
type##PointPatchVectorField \
); \
makePointPatchTypeField \
makeTemplatePointPatchTypeField \
( \
pointPatchSphericalTensorField, \
type##PointPatchSphericalTensorField \
); \
makePointPatchTypeField \
makeTemplatePointPatchTypeField \
( \
pointPatchSymmTensorField, \
type##PointPatchSymmTensorField \
); \
makePointPatchTypeField \
makeTemplatePointPatchTypeField \
( \
pointPatchTensorField, \
type##PointPatchTensorField \
);
#define makePointPatchFieldsTypeName(type) \
defineNamedTemplateTypeNameAndDebug(type##PointPatchScalarField, 0); \
defineNamedTemplateTypeNameAndDebug(type##PointPatchVectorField, 0); \
defineNamedTemplateTypeNameAndDebug \
( \
type##PointPatchSphericalTensorField, 0 \
); \
defineNamedTemplateTypeNameAndDebug(type##PointPatchSymmTensorField, 0); \
defineNamedTemplateTypeNameAndDebug(type##PointPatchTensorField, 0)
#define makePointPatchFieldTypedefs(type) \
typedef type##PointPatchField<scalar> type##PointPatchScalarField; \
typedef type##PointPatchField<vector> type##PointPatchVectorField; \
......
......@@ -164,7 +164,7 @@ void Foam::SRFVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
SRFVelocityFvPatchVectorField
......
......@@ -35,7 +35,11 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchFields(processorCyclic);
//makePatchTypeField(fvPatchScalarField, processorCyclicFvPatchScalarField);
// makeTemplatePatchTypeField
// (
// fvPatchScalarField,
// processorCyclicFvPatchScalarField
// );
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -310,7 +310,7 @@ void Foam::activeBaffleVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
activeBaffleVelocityFvPatchVectorField
......
......@@ -145,7 +145,7 @@ void Foam::buoyantPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
buoyantPressureFvPatchScalarField
......
......@@ -161,7 +161,7 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
cylindricalInletVelocityFvPatchVectorField
......
......@@ -264,7 +264,7 @@ void Foam::directMappedVelocityFluxFixedValueFvPatchField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
directMappedVelocityFluxFixedValueFvPatchField
......
......@@ -43,7 +43,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class jumpCyclicFvPatch Declaration
Class fanFvPatchField Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
......
......@@ -35,7 +35,11 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, fanFvPatchScalarField);
makeTemplatePatchTypeField
(
fvPatchScalarField,
fanFvPatchScalarField
);
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
......
......@@ -172,7 +172,7 @@ void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
fixedFluxPressureFvPatchScalarField
......
......@@ -34,8 +34,16 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
makePatchTypeField(fvPatchVectorField, fixedNormalSlipFvPatchVectorField);
makePatchTypeField(fvPatchTensorField, fixedNormalSlipFvPatchTensorField);
makeTemplatePatchTypeField
(
fvPatchVectorField,
fixedNormalSlipFvPatchVectorField
);
makeTemplatePatchTypeField
(
fvPatchTensorField,
fixedNormalSlipFvPatchTensorField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -137,7 +137,7 @@ void Foam::fixedPressureCompressibleDensityFvPatchScalarField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
fixedPressureCompressibleDensityFvPatchScalarField
......
......@@ -168,7 +168,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
flowRateInletVelocityFvPatchVectorField
......
......@@ -152,7 +152,7 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
fluxCorrectedVelocityFvPatchVectorField
......
......@@ -144,7 +144,7 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs()
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
freestreamPressureFvPatchScalarField
......
......@@ -203,7 +203,7 @@ const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
inletOutletTotalTemperatureFvPatchScalarField
......
......@@ -148,7 +148,7 @@ void Foam::movingWallVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
movingWallVelocityFvPatchVectorField
......
......@@ -218,7 +218,7 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureDirectedInletOutletVelocityFvPatchVectorField
......
......@@ -204,7 +204,7 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureDirectedInletVelocityFvPatchVectorField
......
......@@ -213,7 +213,7 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureInletOutletVelocityFvPatchVectorField
......
......@@ -117,7 +117,7 @@ void Foam::pressureInletUniformVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureInletUniformVelocityFvPatchVectorField
......
......@@ -166,7 +166,7 @@ void Foam::pressureInletVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureInletVelocityFvPatchVectorField
......
......@@ -187,7 +187,7 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::operator=
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
pressureNormalInletOutletVelocityFvPatchVectorField
......
......@@ -134,7 +134,7 @@ void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
rotatingPressureInletOutletVelocityFvPatchVectorField
......
......@@ -127,7 +127,7 @@ void Foam::rotatingTotalPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
rotatingTotalPressureFvPatchScalarField
......
......@@ -143,7 +143,7 @@ void Foam::rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
rotatingWallVelocityFvPatchVectorField
......
......@@ -300,7 +300,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
supersonicFreestreamFvPatchVectorField
......
......@@ -134,7 +134,7 @@ void Foam::surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
surfaceNormalFixedValueFvPatchVectorField
......
......@@ -189,7 +189,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
swirlFlowRateInletVelocityFvPatchVectorField
......
......@@ -247,7 +247,7 @@ void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
syringePressureFvPatchScalarField
......
......@@ -121,7 +121,7 @@ write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
timeVaryingFlowRateInletVelocityFvPatchVectorField
......
......@@ -232,7 +232,7 @@ write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
timeVaryingUniformTotalPressureFvPatchScalarField
......
......@@ -241,7 +241,7 @@ void Foam::totalPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
totalPressureFvPatchScalarField
......
......@@ -190,7 +190,7 @@ void Foam::totalTemperatureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchScalarField,
totalTemperatureFvPatchScalarField
......
......@@ -124,7 +124,7 @@ void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(
fvPatchVectorField,
translatingWallVelocityFvPatchVectorField
......
......@@ -147,7 +147,7 @@ void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
namespace Foam
{
makeNonTemplatedPatchTypeField
makePatchTypeField
(