From 03cc82525432c9937165eb83796cea7c033c16fe Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 29 May 2023 11:11:35 +0100 Subject: [PATCH] pointPatchFields: Removed all pointPatchFields requiring user specified data from the null-constructor table This avoids potential hidden run-time errors caused by solvers running with boundary conditions which are not fully specified. Note that "null-constructor" here means the constructor from patch and internal field only, no data is provided. Constraint and simple BCs such as 'calculated', 'zeroGradient' and others which do not require user input to fully specify their operation remain on the null-constructor table for the construction of fields with for example all 'calculated' or all 'zeroGradient' BCs. Following this improvement the null-constructors have been removed from all pointPatchFields not added to the null-constructor table thus reducing the amount of code and maintenance overhead and making easier and more obvious to write new pointPatchField types. --- .../codedFixedValuePointPatchFieldTemplate.C | 17 ------- .../codedFixedValuePointPatchFieldTemplate.H | 7 --- .../calculated/calculatedPointPatchFields.C | 6 +-- .../fixedValue/fixedValuePointPatchFields.C | 4 +- .../basic/value/valuePointPatchFields.C | 4 +- .../zeroGradientPointPatchFields.C | 4 +- .../cyclic/cyclicPointPatchFields.C | 4 +- .../cyclicSlip/cyclicSlipPointPatchFields.C | 4 +- .../constraint/empty/emptyPointPatchFields.C | 4 +- .../internal/internalPointPatchFields.C | 4 +- .../processor/processorPointPatchFields.C | 4 +- .../processorCyclicPointPatchFields.C | 4 +- .../symmetry/symmetryPointPatchFields.C | 4 +- .../symmetryPlanePointPatchFields.C | 4 +- .../constraint/wedge/wedgePointPatchFields.C | 4 +- .../codedFixedValuePointPatchField.C | 15 +----- .../codedFixedValuePointPatchField.H | 7 --- .../codedFixedValuePointPatchFields.C | 13 +++-- .../derived/slip/slipPointPatchFields.C | 4 +- .../uniformFixedValuePointPatchField.C | 15 +----- .../uniformFixedValuePointPatchField.H | 9 +--- .../pointPatchField/pointPatchField.H | 50 ++++++++++++++++--- .../pointPatchField/pointPatchFieldNew.C | 18 ++++--- ...yMotionDisplacementPointPatchVectorField.C | 14 +----- ...yMotionDisplacementPointPatchVectorField.H | 9 +--- .../codedFixedValueFvPatchFields.C | 11 ++-- ...llatingDisplacementPointPatchVectorField.C | 17 ------- ...llatingDisplacementPointPatchVectorField.H | 7 --- ...OscillatingVelocityPointPatchVectorField.C | 17 ------- ...OscillatingVelocityPointPatchVectorField.H | 7 --- ...llatingDisplacementPointPatchVectorField.C | 15 +----- ...llatingDisplacementPointPatchVectorField.H | 9 +--- ...oscillatingVelocityPointPatchVectorField.C | 14 ------ ...oscillatingVelocityPointPatchVectorField.H | 7 --- ...surfaceDisplacementPointPatchVectorField.C | 17 +------ ...surfaceDisplacementPointPatchVectorField.H | 9 +--- ...aceSlipDisplacementPointPatchVectorField.C | 16 +----- ...aceSlipDisplacementPointPatchVectorField.H | 9 +--- ...meVaryingMappedFixedValuePointPatchField.C | 24 --------- ...meVaryingMappedFixedValuePointPatchField.H | 7 --- ...polatedDisplacementPointPatchVectorField.C | 13 +---- ...polatedDisplacementPointPatchVectorField.H | 9 +--- .../waveDisplacementPointPatchVectorField.C | 16 +----- .../waveDisplacementPointPatchVectorField.H | 7 --- .../genericPointPatchField.C | 13 ----- .../genericPointPatchField.H | 7 --- .../zeroFixedValuePointPatchFields.C | 4 +- .../nonConformalCyclicPointPatchFields.C | 4 +- .../nonConformalErrorPointPatchFields.C | 4 +- ...ConformalProcessorCyclicPointPatchFields.C | 4 +- 50 files changed, 122 insertions(+), 377 deletions(-) diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C index b50a5ca61c..fe0955df07 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C @@ -82,23 +82,6 @@ const char* const ${typeName}FixedValuePointPatch${FieldType}::SHA1sum = // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -${typeName}FixedValuePointPatch${FieldType}:: -${typeName}FixedValuePointPatch${FieldType} -( - const pointPatch& p, - const DimensionedField<${TemplateType}, pointMesh>& iF -) -: - fixedValuePointPatchField<${TemplateType}>(p, iF) -{ - if (${verbose:-false}) - { - Info<<"construct ${typeName} sha1: ${SHA1sum}" - " from patch/DimensionedField\n"; - } -} - - ${typeName}FixedValuePointPatch${FieldType}:: ${typeName}FixedValuePointPatch${FieldType} ( diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H index 40c1458b77..b096e9e967 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.H @@ -61,13 +61,6 @@ public: // Constructors - //- Construct from patch and internal field - ${typeName}FixedValuePointPatch${FieldType} - ( - const pointPatch&, - const DimensionedField<${TemplateType}, pointMesh>& - ); - //- Construct from patch, internal field and dictionary ${typeName}FixedValuePointPatch${FieldType} ( diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.C index 4dbfc7804b..5e507fce4b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,8 +34,8 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makeTemplatePointPatchTypeField(label, calculated); -makePointPatchFields(calculated); +makeNullConstructableTemplatePointPatchTypeField(label, calculated); +makeNullConstructablePointPatchFields(calculated); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchFields.C index 4d7ea94b40..8470f99caf 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(fixedValue); +makeNullConstructablePointPatchFields(fixedValue); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.C index d503b3df01..3a3f420122 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(value); +makeNullConstructablePointPatchFields(value); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.C index e15a226b52..89fdbb1f82 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(zeroGradient); +makeNullConstructablePointPatchFields(zeroGradient); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchFields.C index 3751c340ec..c9edeedad5 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(cyclic); +makeNullConstructablePointPatchFields(cyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C index 152091447b..0ce9d55954 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(cyclicSlip); +makeNullConstructablePointPatchFields(cyclicSlip); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.C index 3b3bbf6f7a..e9bcf4d31b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(empty); +makeNullConstructablePointPatchFields(empty); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchFields.C index b9eae788d9..058c8547a6 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/internal/internalPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(internal); +makeNullConstructablePointPatchFields(internal); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.C index 2a9a54c554..2435737429 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(processor); +makeNullConstructablePointPatchFields(processor); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C index 0479eb9e38..d256f9135c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(processorCyclic); +makeNullConstructablePointPatchFields(processorCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.C index e70bd2abc0..82be6b857a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(symmetry); +makeNullConstructablePointPatchFields(symmetry); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.C index 24467c739a..ad6e8e7a6d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(symmetryPlane); +makeNullConstructablePointPatchFields(symmetryPlane); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.C index 3fabea81b7..fb38256d63 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(wedge); +makeNullConstructablePointPatchFields(wedge); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C index a31941e647..2a5b9786d1 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,19 +104,6 @@ void Foam::codedFixedValuePointPatchField::clearRedirect() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::codedFixedValuePointPatchField::codedFixedValuePointPatchField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - codedBase(), - redirectPatchFieldPtr_() -{} - - template Foam::codedFixedValuePointPatchField::codedFixedValuePointPatchField ( diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H index 9274216e1f..0524678c32 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H @@ -125,13 +125,6 @@ public: // Constructors - //- Construct from patch and internal field - codedFixedValuePointPatchField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary codedFixedValuePointPatchField ( diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C index 4fe2554b16..0c26677753 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,12 +27,17 @@ License #include "pointPatchFields.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - makePointPatchFields(codedFixedValue); -} +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makePointPatchFields(codedFixedValue); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.C b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.C index 0b6ed7636c..9edf7174ec 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(slip); +makeNullConstructablePointPatchFields(slip); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C index 694967bae3..a8e5374abf 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,19 +27,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // -template -Foam::uniformFixedValuePointPatchField:: -uniformFixedValuePointPatchField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - uniformValue_() -{} - - template Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H index eac405677b..bbeb387003 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,13 +78,6 @@ public: // Constructors - //- Construct from patch and internal field - uniformFixedValuePointPatchField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary uniformFixedValuePointPatchField ( diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index fa1719e77c..a09fc075f7 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H @@ -524,14 +524,7 @@ const pointPatchField& operator+ defineTemplateRunTimeSelectionTable(pointPatchTypeField, dictionary); - #define addToPointPatchFieldRunTimeSelection(PatchTypeField,typePatchTypeField)\ - addToRunTimeSelectionTable \ - ( \ - PatchTypeField, \ - typePatchTypeField, \ - pointPatch \ - ); \ addToRunTimeSelectionTable \ ( \ PatchTypeField, \ @@ -546,12 +539,37 @@ const pointPatchField& operator+ ); +#define addToNullConstructablePointPatchFieldRunTimeSelection( \ + PatchTypeField, typePatchTypeField) \ + \ + addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) \ + \ + addToRunTimeSelectionTable \ + ( \ + PatchTypeField, \ + typePatchTypeField, \ + pointPatch \ + ); + + // For non-templated patch fields #define makePointPatchTypeField(PatchTypeField, typePatchTypeField) \ defineTypeNameAndDebug(typePatchTypeField, 0); \ addToPointPatchFieldRunTimeSelection(PatchTypeField, typePatchTypeField) +// For non-templated patch fields +#define makeNullConstructablePointPatchTypeField( \ + PatchTypeField, typePatchTypeField) \ + \ + defineTypeNameAndDebug(typePatchTypeField, 0); \ + addToNullConstructablePointPatchFieldRunTimeSelection \ + ( \ + PatchTypeField, \ + typePatchTypeField \ + ) + + // For templated patch fields #define makeTemplatePointPatchTypeField(fieldType, type) \ defineNamedTemplateTypeNameAndDebug \ @@ -566,10 +584,28 @@ const pointPatchField& operator+ ) +// For templated patch fields +#define makeNullConstructableTemplatePointPatchTypeField(fieldType, type) \ + defineNamedTemplateTypeNameAndDebug \ + ( \ + CAT4(type, PointPatch, CAPITALIZE(fieldType), Field), \ + 0 \ + ); \ + addToNullConstructablePointPatchFieldRunTimeSelection \ + ( \ + CAT3(pointPatch, CAPITALIZE(fieldType), Field), \ + CAT4(type, PointPatch, CAPITALIZE(fieldType), Field) \ + ) + + #define makePointPatchFields(type) \ FOR_ALL_FIELD_TYPES(makeTemplatePointPatchTypeField, type) +#define makeNullConstructablePointPatchFields(type) \ + FOR_ALL_FIELD_TYPES(makeNullConstructableTemplatePointPatchTypeField, type) + + #define makePointPatchFieldTypeName(fieldType, type) \ defineNamedTemplateTypeNameAndDebug \ ( \ diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C index a6d841eb7a..874cf72c50 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,11 +49,12 @@ Foam::autoPtr> Foam::pointPatchField::New if (cstrIter == pointPatchConstructorTablePtr_->end()) { FatalErrorInFunction - << "Unknown patchField type " - << patchFieldType << nl << nl - << "Valid patchField types are :" << endl + << "Unknown null-constructable patchField type " << patchFieldType + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl + << "Valid null-constructable patchField types are :" << endl << pointPatchConstructorTablePtr_->sortedToc() - << exit(FatalError); + << abort(FatalError); } if @@ -129,7 +130,8 @@ Foam::autoPtr> Foam::pointPatchField::New ( dict ) << "Unknown patchField type " << patchFieldType - << " for patch type " << p.type() << nl << nl + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl << "Valid patchField types are :" << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalIOError); @@ -185,7 +187,9 @@ Foam::autoPtr> Foam::pointPatchField::New if (cstrIter == patchMapperConstructorTablePtr_->end()) { FatalErrorInFunction - << "Unknown patchField type " << ptf.type() << nl << nl + << "Unknown patchField type " << ptf.type() + << " for patch " << p.name() << " of type " << p.type() + << " for field " << iF.name() << nl << nl << "Valid patchField types are :" << endl << patchMapperConstructorTablePtr_->sortedToc() << exit(FatalError); diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C index 810b479361..d5cf2e9e1d 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,18 +35,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // -solidBodyMotionDisplacementPointPatchVectorField:: -solidBodyMotionDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchVectorField(p, iF), - SBMFPtr_() -{} - - solidBodyMotionDisplacementPointPatchVectorField:: solidBodyMotionDisplacementPointPatchVectorField ( diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H index adb8de57f0..69a94bb6a9 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,13 +68,6 @@ public: // Constructors - //- Construct from patch and internal field - solidBodyMotionDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary solidBodyMotionDisplacementPointPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C index f1ef864fa8..f3c7b63986 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchFields.C @@ -26,12 +26,17 @@ License #include "codedFixedValueFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - makePatchFields(codedFixedValue); -} +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makePatchFields(codedFixedValue); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam // ************************************************************************* // diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C index b9b9a54948..81e8f2612a 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C @@ -36,23 +36,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -angularOscillatingDisplacementPointPatchVectorField:: -angularOscillatingDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - axis_(Zero), - origin_(Zero), - angle0_(0.0), - amplitude_(0.0), - omega_(0.0), - p0_(p.localPoints()) -{} - - angularOscillatingDisplacementPointPatchVectorField:: angularOscillatingDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H index 02a2e32f85..fe08ae31de 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H @@ -69,13 +69,6 @@ public: // Constructors - //- Construct from patch and internal field - angularOscillatingDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary angularOscillatingDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C index 2cd9b92b42..205646c6bb 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C @@ -36,23 +36,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -angularOscillatingVelocityPointPatchVectorField:: -angularOscillatingVelocityPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - axis_(Zero), - origin_(Zero), - angle0_(0.0), - amplitude_(0.0), - omega_(0.0), - p0_(p.localPoints()) -{} - - angularOscillatingVelocityPointPatchVectorField:: angularOscillatingVelocityPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H index 57589b0282..56b6d2ac57 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H @@ -69,13 +69,6 @@ public: // Constructors - //- Construct from patch and internal field - angularOscillatingVelocityPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary angularOscillatingVelocityPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C index d96731c73b..88acec3fed 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,19 +36,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -oscillatingDisplacementPointPatchVectorField:: -oscillatingDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - amplitude_(Zero), - omega_(0.0) -{} - - oscillatingDisplacementPointPatchVectorField:: oscillatingDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H index b4129d2da8..b2d6bab068 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,13 +64,6 @@ public: // Constructors - //- Construct from patch and internal field - oscillatingDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary oscillatingDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C index 0766ff2423..4e1a7e8d2a 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C @@ -36,20 +36,6 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -oscillatingVelocityPointPatchVectorField:: -oscillatingVelocityPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - amplitude_(Zero), - omega_(0.0), - p0_(p.localPoints()) -{} - - oscillatingVelocityPointPatchVectorField:: oscillatingVelocityPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H index e2e769eb1f..daacbee3e4 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H @@ -66,13 +66,6 @@ public: // Constructors - //- Construct from patch and internal field - oscillatingVelocityPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary oscillatingVelocityPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C index 3f77c6ac1f..fcb1f81d38 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -304,21 +304,6 @@ void surfaceDisplacementPointPatchVectorField::calcProjection // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -surfaceDisplacementPointPatchVectorField:: -surfaceDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchVectorField(p, iF), - velocity_(Zero), - projectMode_(NEAREST), - projectDir_(Zero), - wedgePlane_(-1) -{} - - surfaceDisplacementPointPatchVectorField:: surfaceDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H index 69af4da029..2187a711ba 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -129,13 +129,6 @@ public: // Constructors - //- Construct from patch and internal field - surfaceDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary surfaceDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C index f84affe96b..33e9793d8f 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -303,20 +303,6 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -surfaceSlipDisplacementPointPatchVectorField:: -surfaceSlipDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - pointPatchVectorField(p, iF), - projectMode_(NEAREST), - projectDir_(Zero), - wedgePlane_(-1) -{} - - surfaceSlipDisplacementPointPatchVectorField:: surfaceSlipDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H index 2a9df0f5a3..dfe0b6deb3 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -120,13 +120,6 @@ public: // Constructors - //- Construct from patch and internal field - surfaceSlipDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary surfaceSlipDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C index a6c00603af..93342c880c 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C @@ -30,30 +30,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::timeVaryingMappedFixedValuePointPatchField:: -timeVaryingMappedFixedValuePointPatchField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - fieldTableName_(iF.name()), - setAverage_(false), - perturb_(0), - mapperPtr_(nullptr), - sampleTimes_(0), - startSampleTime_(-1), - startSampledValues_(0), - startAverage_(Zero), - endSampleTime_(-1), - endSampledValues_(0), - endAverage_(Zero), - offset_() -{} - - template Foam::timeVaryingMappedFixedValuePointPatchField:: timeVaryingMappedFixedValuePointPatchField diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H index 65aeb1cf26..c9da29eae9 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.H @@ -107,13 +107,6 @@ public: // Constructors - //- Construct from patch and internal field - timeVaryingMappedFixedValuePointPatchField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary timeVaryingMappedFixedValuePointPatchField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C index 4244b5bdd5..a4433d6039 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,17 +29,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::uniformInterpolatedDisplacementPointPatchVectorField:: -uniformInterpolatedDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF) -{} - - Foam::uniformInterpolatedDisplacementPointPatchVectorField:: uniformInterpolatedDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H index a2f996152d..085272af85 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,13 +84,6 @@ public: // Constructors - //- Construct from patch and internal field - uniformInterpolatedDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary uniformInterpolatedDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C index 6c6e6ff728..5cb13f3f68 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,20 +32,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::waveDisplacementPointPatchVectorField:: -waveDisplacementPointPatchVectorField -( - const pointPatch& p, - const DimensionedField& iF -) -: - fixedValuePointPatchField(p, iF), - amplitude_(Zero), - omega_(0.0), - waveNumber_(Zero) -{} - - Foam::waveDisplacementPointPatchVectorField:: waveDisplacementPointPatchVectorField ( diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H index 78b65c4729..27f88efa59 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H +++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.H @@ -119,13 +119,6 @@ public: // Constructors - //- Construct from patch and internal field - waveDisplacementPointPatchVectorField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary waveDisplacementPointPatchVectorField ( diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C index 5ae0d1017e..459fdf864e 100644 --- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C +++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C @@ -28,19 +28,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::genericPointPatchField::genericPointPatchField -( - const pointPatch& p, - const DimensionedField& iF -) -: - calculatedPointPatchField(p, iF) -{ - NotImplemented; -} - - template Foam::genericPointPatchField::genericPointPatchField ( diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H index 6ee5f23a5e..e70d85380c 100644 --- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H +++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H @@ -74,13 +74,6 @@ public: // Constructors - //- Construct from patch and internal field - genericPointPatchField - ( - const pointPatch&, - const DimensionedField& - ); - //- Construct from patch, internal field and dictionary genericPointPatchField ( diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C index a45f5ddafc..0f7ebafca2 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(zeroFixedValue); +makeNullConstructablePointPatchFields(zeroFixedValue); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchFields.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchFields.C index 1fae7404cf..23b0dbde4a 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchFields.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalCyclic/nonConformalCyclicPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(nonConformalCyclic); +makeNullConstructablePointPatchFields(nonConformalCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchFields.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchFields.C index 95dcd42085..b0a1a02d62 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchFields.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalError/nonConformalErrorPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(nonConformalError); +makeNullConstructablePointPatchFields(nonConformalError); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchFields.C b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchFields.C index 54740bd5c2..13ac13ad17 100644 --- a/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchFields.C +++ b/src/meshTools/nonConformal/pointPatchFields/nonConformalProcessorCyclic/nonConformalProcessorCyclicPointPatchFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makePointPatchFields(nonConformalProcessorCyclic); +makeNullConstructablePointPatchFields(nonConformalProcessorCyclic); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //