diff --git a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C index 44a053124f..a01c251794 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFixedValueFvPatchFieldTemplate.C @@ -100,6 +100,24 @@ ${typeName}FixedValueFvPatch${FieldType} } +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const dictionary& dict +) +: + fixedValueFvPatchField<${TemplateType}>(p, iF, dict) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + ${typeName}FixedValueFvPatch${FieldType}:: ${typeName}FixedValueFvPatch${FieldType} ( @@ -119,24 +137,6 @@ ${typeName}FixedValueFvPatch${FieldType} } -${typeName}FixedValueFvPatch${FieldType}:: -${typeName}FixedValueFvPatch${FieldType} -( - const fvPatch& p, - const DimensionedField<${TemplateType}, volMesh>& iF, - const dictionary& dict -) -: - fixedValueFvPatchField<${TemplateType}>(p, iF, dict) -{ - if (${verbose:-false}) - { - Info<<"construct ${typeName} sha1: ${SHA1sum}" - " from patch/dictionary\n"; - } -} - - ${typeName}FixedValueFvPatch${FieldType}:: ${typeName}FixedValueFvPatch${FieldType} ( diff --git a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C index 294312dd2b..b50a5ca61c 100644 --- a/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFixedValuePointPatchFieldTemplate.C @@ -99,6 +99,24 @@ ${typeName}FixedValuePointPatch${FieldType} } +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const pointPatch& p, + const DimensionedField<${TemplateType}, pointMesh>& iF, + const dictionary& dict +) +: + fixedValuePointPatchField<${TemplateType}>(p, iF, dict) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + ${typeName}FixedValuePointPatch${FieldType}:: ${typeName}FixedValuePointPatch${FieldType} ( @@ -118,24 +136,6 @@ ${typeName}FixedValuePointPatch${FieldType} } -${typeName}FixedValuePointPatch${FieldType}:: -${typeName}FixedValuePointPatch${FieldType} -( - const pointPatch& p, - const DimensionedField<${TemplateType}, pointMesh>& iF, - const dictionary& dict -) -: - fixedValuePointPatchField<${TemplateType}>(p, iF, dict) -{ - if (${verbose:-false}) - { - Info<<"construct ${typeName} sha1: ${SHA1sum}" - " from patch/dictionary\n"; - } -} - - ${typeName}FixedValuePointPatch${FieldType}:: ${typeName}FixedValuePointPatch${FieldType} ( diff --git a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C index 7c0833379b..a017ac82c9 100644 --- a/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedMixedFvPatchFieldTemplate.C @@ -100,6 +100,24 @@ ${typeName}MixedValueFvPatch${FieldType} } +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const dictionary& dict +) +: + mixedFvPatchField<${TemplateType}>(p, iF, dict) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + ${typeName}MixedValueFvPatch${FieldType}:: ${typeName}MixedValueFvPatch${FieldType} ( @@ -119,24 +137,6 @@ ${typeName}MixedValueFvPatch${FieldType} } -${typeName}MixedValueFvPatch${FieldType}:: -${typeName}MixedValueFvPatch${FieldType} -( - const fvPatch& p, - const DimensionedField<${TemplateType}, volMesh>& iF, - const dictionary& dict -) -: - mixedFvPatchField<${TemplateType}>(p, iF, dict) -{ - if (${verbose:-false}) - { - Info<<"construct ${typeName} sha1: ${SHA1sum}" - " from patch/dictionary\n"; - } -} - - ${typeName}MixedValueFvPatch${FieldType}:: ${typeName}MixedValueFvPatch${FieldType} ( diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C index f56de53ed3..78da35aa2e 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,19 +40,6 @@ Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField {} -template -Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField -( - const basicSymmetryFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - transformFvPatchField(ptf, p, iF, mapper) -{} - - template Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( @@ -67,6 +54,19 @@ Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField } +template +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField +( + const basicSymmetryFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + transformFvPatchField(ptf, p, iF, mapper) +{} + + template Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C index cc004f1e54..419f1ccf01 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,6 +52,20 @@ Foam::coupledFvPatchField::coupledFvPatchField {} +template +Foam::coupledFvPatchField::coupledFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict, + const bool valueRequired +) +: + LduInterfaceField(refCast(p)), + fvPatchField(p, iF, dict, valueRequired) +{} + + template Foam::coupledFvPatchField::coupledFvPatchField ( @@ -67,20 +81,6 @@ Foam::coupledFvPatchField::coupledFvPatchField {} -template -Foam::coupledFvPatchField::coupledFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict, - const bool valueRequired -) -: - LduInterfaceField(refCast(p)), - fvPatchField(p, iF, dict, valueRequired) -{} - - template Foam::coupledFvPatchField::coupledFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C index 7485f2dd8f..5c9b114270 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,23 @@ Foam::directionMixedFvPatchField::directionMixedFvPatchField {} +template +Foam::directionMixedFvPatchField::directionMixedFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + transformFvPatchField(p, iF, dict), + refValue_("refValue", dict, p.size()), + refGrad_("refGradient", dict, p.size()), + valueFraction_("valueFraction", dict, p.size()) +{ + evaluate(); +} + + template Foam::directionMixedFvPatchField::directionMixedFvPatchField ( @@ -68,23 +85,6 @@ Foam::directionMixedFvPatchField::directionMixedFvPatchField } -template -Foam::directionMixedFvPatchField::directionMixedFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - transformFvPatchField(p, iF, dict), - refValue_("refValue", dict, p.size()), - refGrad_("refGradient", dict, p.size()), - valueFraction_("valueFraction", dict, p.size()) -{ - evaluate(); -} - - template Foam::directionMixedFvPatchField::directionMixedFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C index 5a452dd5ff..2fb357cf89 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,6 +40,18 @@ Foam::transformFvPatchField::transformFvPatchField {} +template +Foam::transformFvPatchField::transformFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvPatchField(p, iF, dict, false) +{} + + template Foam::transformFvPatchField::transformFvPatchField ( @@ -53,18 +65,6 @@ Foam::transformFvPatchField::transformFvPatchField {} -template -Foam::transformFvPatchField::transformFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvPatchField(p, iF, dict, false) -{} - - template Foam::transformFvPatchField::transformFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C index b04296babc..c5c50aff96 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicSlip/cyclicSlipFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,6 +38,18 @@ Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField {} +template +Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + cyclicFvPatchField(p, iF, dict) +{} + + template Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField ( @@ -51,18 +63,6 @@ Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField {} -template -Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvPatchField(p, iF, dict) -{} - - template Foam::cyclicSlipFvPatchField::cyclicSlipFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index aad77220be..643971699a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,29 +39,6 @@ Foam::emptyFvPatchField::emptyFvPatchField {} -template -Foam::emptyFvPatchField::emptyFvPatchField -( - const emptyFvPatchField&, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& -) -: - fvPatchField(p, iF, Field(0)) -{ - if (!isType(p)) - { - FatalErrorInFunction - << "' not constraint type '" << typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->internalField().name() - << " in file " << this->internalField().objectPath() - << exit(FatalIOError); - } -} - - template Foam::emptyFvPatchField::emptyFvPatchField ( @@ -87,6 +64,29 @@ Foam::emptyFvPatchField::emptyFvPatchField } +template +Foam::emptyFvPatchField::emptyFvPatchField +( + const emptyFvPatchField&, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& +) +: + fvPatchField(p, iF, Field(0)) +{ + if (!isType(p)) + { + FatalErrorInFunction + << "' not constraint type '" << typeName << "'" + << "\n for patch " << p.name() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() + << exit(FatalError); + } +} + + template Foam::emptyFvPatchField::emptyFvPatchField ( @@ -98,14 +98,4 @@ Foam::emptyFvPatchField::emptyFvPatchField {} -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::emptyFvPatchField::updateCoeffs() -{ - // Check moved to checkMesh. - // Test here fails if multiple empty patches. -} - - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H index 826fe56332..f86619ee90 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,12 +137,6 @@ public: // Evaluation functions - //- Update the coefficients associated with the patch field - // This only checks to see the case is actually 1D or 2D - // for which this boundary condition is valid - void updateCoeffs(); - - //- Return the matrix diagonal coefficients corresponding to the // evaluation of the value of this patchField with given weights virtual tmp> valueInternalCoeffs diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C index 00aa0e994f..b0452a277d 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,19 +38,6 @@ Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField {} -template -Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField -( - const jumpCyclicFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - cyclicFvPatchField(ptf, p, iF, mapper) -{} - - template Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField ( @@ -66,6 +53,19 @@ Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField } +template +Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField +( + const jumpCyclicFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + cyclicFvPatchField(ptf, p, iF, mapper) +{} + + template Foam::jumpCyclicFvPatchField::jumpCyclicFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C index d18098ffb2..47e547ce2e 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,19 +39,6 @@ Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField {} -template -Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField -( - const jumpCyclicAMIFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - cyclicAMIFvPatchField(ptf, p, iF, mapper) -{} - - template Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField ( @@ -67,6 +54,19 @@ Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField } +template +Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField +( + const jumpCyclicAMIFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + cyclicAMIFvPatchField(ptf, p, iF, mapper) +{} + + template Foam::jumpCyclicAMIFvPatchField::jumpCyclicAMIFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C index 9dc4540877..ca682fee60 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,30 +40,6 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField {} -template -Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField -( - const symmetryPlaneFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - basicSymmetryFvPatchField(ptf, p, iF, mapper), - symmetryPlanePatch_(refCast(p)) -{ - if (!isType(this->patch())) - { - FatalErrorInFunction - << "' not constraint type '" << typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->internalField().name() - << " in file " << this->internalField().objectPath() - << exit(FatalIOError); - } -} - - template Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField ( @@ -90,6 +66,30 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField } +template +Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField +( + const symmetryPlaneFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + basicSymmetryFvPatchField(ptf, p, iF, mapper), + symmetryPlanePatch_(refCast(p)) +{ + if (!isType(this->patch())) + { + FatalErrorInFunction + << "' not constraint type '" << typeName << "'" + << "\n for patch " << p.name() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() + << exit(FatalIOError); + } +} + + template Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index 8397def91d..fd8792cf85 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,29 +43,6 @@ Foam::wedgeFvPatchField::wedgeFvPatchField {} -template -Foam::wedgeFvPatchField::wedgeFvPatchField -( - const wedgeFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - transformFvPatchField(ptf, p, iF, mapper) -{ - if (!isType(this->patch())) - { - FatalErrorInFunction - << "' not constraint type '" << typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->internalField().name() - << " in file " << this->internalField().objectPath() - << exit(FatalIOError); - } -} - - template Foam::wedgeFvPatchField::wedgeFvPatchField ( @@ -93,6 +70,29 @@ Foam::wedgeFvPatchField::wedgeFvPatchField } +template +Foam::wedgeFvPatchField::wedgeFvPatchField +( + const wedgeFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + transformFvPatchField(ptf, p, iF, mapper) +{ + if (!isType(this->patch())) + { + FatalErrorInFunction + << "' not constraint type '" << typeName << "'" + << "\n for patch " << p.name() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() + << exit(FatalIOError); + } +} + + template Foam::wedgeFvPatchField::wedgeFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C index 4bed20a466..61cff15c76 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,30 +53,6 @@ activeBaffleVelocityFvPatchVectorField {} -Foam::activeBaffleVelocityFvPatchVectorField:: -activeBaffleVelocityFvPatchVectorField -( - const activeBaffleVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchVectorField(ptf, p, iF, mapper), - pName_(ptf.pName_), - cyclicPatchName_(ptf.cyclicPatchName_), - cyclicPatchLabel_(ptf.cyclicPatchLabel_), - orientation_(ptf.orientation_), - initWallSf_(ptf.initWallSf_), - initCyclicSf_(ptf.initCyclicSf_), - nbrCyclicSf_(ptf.nbrCyclicSf_), - openFraction_(ptf.openFraction_), - openingTime_(ptf.openingTime_), - maxOpenFractionDelta_(ptf.maxOpenFractionDelta_), - curTimeIndex_(-1) -{} - - Foam::activeBaffleVelocityFvPatchVectorField:: activeBaffleVelocityFvPatchVectorField ( @@ -108,6 +84,30 @@ activeBaffleVelocityFvPatchVectorField } +Foam::activeBaffleVelocityFvPatchVectorField:: +activeBaffleVelocityFvPatchVectorField +( + const activeBaffleVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchVectorField(ptf, p, iF, mapper), + pName_(ptf.pName_), + cyclicPatchName_(ptf.cyclicPatchName_), + cyclicPatchLabel_(ptf.cyclicPatchLabel_), + orientation_(ptf.orientation_), + initWallSf_(ptf.initWallSf_), + initCyclicSf_(ptf.initCyclicSf_), + nbrCyclicSf_(ptf.nbrCyclicSf_), + openFraction_(ptf.openFraction_), + openingTime_(ptf.openingTime_), + maxOpenFractionDelta_(ptf.maxOpenFractionDelta_), + curTimeIndex_(-1) +{} + + Foam::activeBaffleVelocityFvPatchVectorField:: activeBaffleVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C index b0ccdbb764..7060887d86 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,33 +56,6 @@ activePressureForceBaffleVelocityFvPatchVectorField {} -Foam::activePressureForceBaffleVelocityFvPatchVectorField:: -activePressureForceBaffleVelocityFvPatchVectorField -( - const activePressureForceBaffleVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchVectorField(ptf, p, iF, mapper), - pName_(ptf.pName_), - cyclicPatchName_(ptf.cyclicPatchName_), - cyclicPatchLabel_(ptf.cyclicPatchLabel_), - orientation_(ptf.orientation_), - initWallSf_(ptf.initWallSf_), - initCyclicSf_(ptf.initCyclicSf_), - nbrCyclicSf_(ptf.nbrCyclicSf_), - openFraction_(ptf.openFraction_), - openingTime_(ptf.openingTime_), - maxOpenFractionDelta_(ptf.maxOpenFractionDelta_), - curTimeIndex_(-1), - minThresholdValue_(ptf.minThresholdValue_), - fBased_(ptf.fBased_), - baffleActivated_(ptf.baffleActivated_) -{} - - Foam::activePressureForceBaffleVelocityFvPatchVectorField:: activePressureForceBaffleVelocityFvPatchVectorField ( @@ -126,6 +99,33 @@ activePressureForceBaffleVelocityFvPatchVectorField } +Foam::activePressureForceBaffleVelocityFvPatchVectorField:: +activePressureForceBaffleVelocityFvPatchVectorField +( + const activePressureForceBaffleVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchVectorField(ptf, p, iF, mapper), + pName_(ptf.pName_), + cyclicPatchName_(ptf.cyclicPatchName_), + cyclicPatchLabel_(ptf.cyclicPatchLabel_), + orientation_(ptf.orientation_), + initWallSf_(ptf.initWallSf_), + initCyclicSf_(ptf.initCyclicSf_), + nbrCyclicSf_(ptf.nbrCyclicSf_), + openFraction_(ptf.openFraction_), + openingTime_(ptf.openingTime_), + maxOpenFractionDelta_(ptf.maxOpenFractionDelta_), + curTimeIndex_(-1), + minThresholdValue_(ptf.minThresholdValue_), + fBased_(ptf.fBased_), + baffleActivated_(ptf.baffleActivated_) +{} + + Foam::activePressureForceBaffleVelocityFvPatchVectorField:: activePressureForceBaffleVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 98bdc5d81c..047e699ed8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,23 +54,6 @@ Foam::advectiveFvPatchField::advectiveFvPatchField } -template -Foam::advectiveFvPatchField::advectiveFvPatchField -( - const advectiveFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_), - fieldInf_(ptf.fieldInf_), - lInf_(ptf.lInf_) -{} - - template Foam::advectiveFvPatchField::advectiveFvPatchField ( @@ -120,6 +103,23 @@ Foam::advectiveFvPatchField::advectiveFvPatchField } +template +Foam::advectiveFvPatchField::advectiveFvPatchField +( + const advectiveFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + rhoName_(ptf.rhoName_), + fieldInf_(ptf.fieldInf_), + lInf_(ptf.lInf_) +{} + + template Foam::advectiveFvPatchField::advectiveFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C index c317fab4dc..6dc38cdaa4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C @@ -115,21 +115,6 @@ Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField {} -template -Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField -( - const codedFixedValueFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - codedBase(ptf), - redirectPatchFieldPtr_() -{} - - template Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField ( @@ -146,6 +131,21 @@ Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField } +template +Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField +( + const codedFixedValueFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField(ptf, p, iF, mapper), + codedBase(ptf), + redirectPatchFieldPtr_() +{} + + template Foam::codedFixedValueFvPatchField::codedFixedValueFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C index 17d43cb35c..150fbb4bfd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C @@ -115,21 +115,6 @@ Foam::codedMixedFvPatchField::codedMixedFvPatchField {} -template -Foam::codedMixedFvPatchField::codedMixedFvPatchField -( - const codedMixedFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - codedBase(ptf), - redirectPatchFieldPtr_() -{} - - template Foam::codedMixedFvPatchField::codedMixedFvPatchField ( @@ -146,6 +131,21 @@ Foam::codedMixedFvPatchField::codedMixedFvPatchField } +template +Foam::codedMixedFvPatchField::codedMixedFvPatchField +( + const codedMixedFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + codedBase(ptf), + redirectPatchFieldPtr_() +{} + + template Foam::codedMixedFvPatchField::codedMixedFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C index 2cd2e276b9..3af3119883 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,6 +48,23 @@ cylindricalInletVelocityFvPatchVectorField {} +Foam::cylindricalInletVelocityFvPatchVectorField:: +cylindricalInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + origin_(dict.lookup("origin")), + axis_(dict.lookup("axis")), + axialVelocity_(Function1::New("axialVelocity", dict)), + radialVelocity_(Function1::New("radialVelocity", dict)), + rpm_(Function1::New("rpm", dict)) +{} + + Foam::cylindricalInletVelocityFvPatchVectorField:: cylindricalInletVelocityFvPatchVectorField ( @@ -66,23 +83,6 @@ cylindricalInletVelocityFvPatchVectorField {} -Foam::cylindricalInletVelocityFvPatchVectorField:: -cylindricalInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - origin_(dict.lookup("origin")), - axis_(dict.lookup("axis")), - axialVelocity_(Function1::New("axialVelocity", dict)), - radialVelocity_(Function1::New("radialVelocity", dict)), - rpm_(Function1::New("rpm", dict)) -{} - - Foam::cylindricalInletVelocityFvPatchVectorField:: cylindricalInletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index 2aeea63ced..5ca39d7026 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -462,31 +462,6 @@ externalCoupledMixedFvPatchField } -template -Foam::externalCoupledMixedFvPatchField:: -externalCoupledMixedFvPatchField -( - const externalCoupledMixedFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - commsDir_(ptf.commsDir_), - fName_(ptf.fName_), - waitInterval_(ptf.waitInterval_), - timeOut_(ptf.timeOut_), - calcFrequency_(ptf.calcFrequency_), - initByExternal_(ptf.initByExternal_), - log_(ptf.log_), - master_(ptf.master_), - offsets_(ptf.offsets_), - initialised_(ptf.initialised_), - coupledPatchIDs_(ptf.coupledPatchIDs_) -{} - - template Foam::externalCoupledMixedFvPatchField:: externalCoupledMixedFvPatchField @@ -540,6 +515,31 @@ externalCoupledMixedFvPatchField } +template +Foam::externalCoupledMixedFvPatchField:: +externalCoupledMixedFvPatchField +( + const externalCoupledMixedFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + commsDir_(ptf.commsDir_), + fName_(ptf.fName_), + waitInterval_(ptf.waitInterval_), + timeOut_(ptf.timeOut_), + calcFrequency_(ptf.calcFrequency_), + initByExternal_(ptf.initByExternal_), + log_(ptf.log_), + master_(ptf.master_), + offsets_(ptf.offsets_), + initialised_(ptf.initialised_), + coupledPatchIDs_(ptf.coupledPatchIDs_) +{} + + template Foam::externalCoupledMixedFvPatchField:: externalCoupledMixedFvPatchField diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C index 69f386a58c..7806e8ec0b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValue/fixedInternalValueFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,6 +40,18 @@ Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField {} +template +Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + zeroGradientFvPatchField(p, iF, dict) +{} + + template Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField ( @@ -53,18 +65,6 @@ Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField {} -template -Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - zeroGradientFvPatchField(p, iF, dict) -{} - - template Foam::fixedInternalValueFvPatchField::fixedInternalValueFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C index a861b542f2..05e31a507b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,20 +39,6 @@ Foam::fixedJumpFvPatchField::fixedJumpFvPatchField {} -template -Foam::fixedJumpFvPatchField::fixedJumpFvPatchField -( - const fixedJumpFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - jumpCyclicFvPatchField(ptf, p, iF, mapper), - jump_(mapper(ptf.jump_)) -{} - - template Foam::fixedJumpFvPatchField::fixedJumpFvPatchField ( @@ -83,6 +69,20 @@ Foam::fixedJumpFvPatchField::fixedJumpFvPatchField } +template +Foam::fixedJumpFvPatchField::fixedJumpFvPatchField +( + const fixedJumpFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + jumpCyclicFvPatchField(ptf, p, iF, mapper), + jump_(mapper(ptf.jump_)) +{} + + template Foam::fixedJumpFvPatchField::fixedJumpFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C index b7f6fbfeaf..9edd3b1a9e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,20 +39,6 @@ Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField {} -template -Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField -( - const fixedJumpAMIFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - jumpCyclicAMIFvPatchField(ptf, p, iF, mapper), - jump_(mapper(ptf.jump_)) -{} - - template Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField ( @@ -83,6 +69,20 @@ Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField } +template +Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField +( + const fixedJumpAMIFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + jumpCyclicAMIFvPatchField(ptf, p, iF, mapper), + jump_(mapper(ptf.jump_)) +{} + + template Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C index 57421873c9..43b54e873e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,20 +41,6 @@ Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField {} -template -Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField -( - const fixedNormalSlipFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - transformFvPatchField(ptf, p, iF, mapper), - fixedValue_(mapper(ptf.fixedValue_)) -{} - - template Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( @@ -70,6 +56,20 @@ Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField } +template +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +( + const fixedNormalSlipFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + transformFvPatchField(ptf, p, iF, mapper), + fixedValue_(mapper(ptf.fixedValue_)) +{} + + template Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C index a38d0adbc6..a6f976f04d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,19 @@ fixedPressureCompressibleDensityFvPatchScalarField {} +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: +fixedPressureCompressibleDensityFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + pName_(dict.lookupOrDefault("p", "p")) +{} + + Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( @@ -57,19 +70,6 @@ fixedPressureCompressibleDensityFvPatchScalarField {} -Foam::fixedPressureCompressibleDensityFvPatchScalarField:: -fixedPressureCompressibleDensityFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - pName_(dict.lookupOrDefault("p", "p")) -{} - - Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index c4df123e31..ab73f49a05 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,21 +44,6 @@ fluxCorrectedVelocityFvPatchVectorField {} -Foam::fluxCorrectedVelocityFvPatchVectorField:: -fluxCorrectedVelocityFvPatchVectorField -( - const fluxCorrectedVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - zeroGradientFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_) -{} - - Foam::fluxCorrectedVelocityFvPatchVectorField:: fluxCorrectedVelocityFvPatchVectorField ( @@ -75,6 +60,21 @@ fluxCorrectedVelocityFvPatchVectorField } +Foam::fluxCorrectedVelocityFvPatchVectorField:: +fluxCorrectedVelocityFvPatchVectorField +( + const fluxCorrectedVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + zeroGradientFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + rhoName_(ptf.rhoName_) +{} + + Foam::fluxCorrectedVelocityFvPatchVectorField:: fluxCorrectedVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C index 7079fc4d5a..38187c1614 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,20 +43,6 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField } -template -Foam::inletOutletFvPatchField::inletOutletFvPatchField -( - const inletOutletFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - phiName_(ptf.phiName_) -{} - - template Foam::inletOutletFvPatchField::inletOutletFvPatchField ( @@ -87,6 +73,20 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField } +template +Foam::inletOutletFvPatchField::inletOutletFvPatchField +( + const inletOutletFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + phiName_(ptf.phiName_) +{} + + template Foam::inletOutletFvPatchField::inletOutletFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C index 3dab6b145e..cf986ba57c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,23 +50,6 @@ inletOutletTotalTemperatureFvPatchScalarField } -Foam::inletOutletTotalTemperatureFvPatchScalarField:: -inletOutletTotalTemperatureFvPatchScalarField -( - const inletOutletTotalTemperatureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchScalarField(ptf, p, iF, mapper), - UName_(ptf.UName_), - psiName_(ptf.psiName_), - gamma_(ptf.gamma_), - T0_(mapper(ptf.T0_)) -{} - - Foam::inletOutletTotalTemperatureFvPatchScalarField:: inletOutletTotalTemperatureFvPatchScalarField ( @@ -101,6 +84,23 @@ inletOutletTotalTemperatureFvPatchScalarField } +Foam::inletOutletTotalTemperatureFvPatchScalarField:: +inletOutletTotalTemperatureFvPatchScalarField +( + const inletOutletTotalTemperatureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchScalarField(ptf, p, iF, mapper), + UName_(ptf.UName_), + psiName_(ptf.psiName_), + gamma_(ptf.gamma_), + T0_(mapper(ptf.T0_)) +{} + + Foam::inletOutletTotalTemperatureFvPatchScalarField:: inletOutletTotalTemperatureFvPatchScalarField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C index 9bdd1245f3..3f7b805871 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/interstitialInletVelocity/interstitialInletVelocityFvPatchVectorField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,20 @@ interstitialInletVelocityFvPatchVectorField {} +Foam::interstitialInletVelocityFvPatchVectorField:: +interstitialInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + inletVelocity_("inletVelocity", dict, p.size()), + alphaName_(dict.lookupOrDefault("alpha", "alpha")) +{} + + Foam::interstitialInletVelocityFvPatchVectorField:: interstitialInletVelocityFvPatchVectorField ( @@ -59,20 +73,6 @@ interstitialInletVelocityFvPatchVectorField {} -Foam::interstitialInletVelocityFvPatchVectorField:: -interstitialInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - inletVelocity_("inletVelocity", dict, p.size()), - alphaName_(dict.lookupOrDefault("alpha", "alpha")) -{} - - Foam::interstitialInletVelocityFvPatchVectorField:: interstitialInletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C index 1e0e1dc971..666b5be0c9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,13 +44,12 @@ template Foam::mappedFixedInternalValueFvPatchField:: mappedFixedInternalValueFvPatchField ( - const mappedFixedInternalValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const dictionary& dict ) : - mappedFixedValueFvPatchField(ptf, p, iF, mapper) + mappedFixedValueFvPatchField(p, iF, dict) {} @@ -58,12 +57,13 @@ template Foam::mappedFixedInternalValueFvPatchField:: mappedFixedInternalValueFvPatchField ( + const mappedFixedInternalValueFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const dictionary& dict + const fvPatchFieldMapper& mapper ) : - mappedFixedValueFvPatchField(p, iF, dict) + mappedFixedValueFvPatchField(ptf, p, iF, mapper) {} diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C index 16a9807f48..dc82aa8cc0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,6 +45,20 @@ Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField {} +Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + nbrPhiName_(dict.lookupOrDefault("nbrPhi", "phi")), + phiName_(dict.lookupOrDefault("phi", "phi")), + rhoName_(dict.lookupOrDefault("rho", "rho")) +{} + + Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField ( const mappedFlowRateFvPatchVectorField& ptf, @@ -60,20 +74,6 @@ Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField {} -Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - nbrPhiName_(dict.lookupOrDefault("nbrPhi", "phi")), - phiName_(dict.lookupOrDefault("phi", "phi")), - rhoName_(dict.lookupOrDefault("rho", "rho")) -{} - - Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField ( const mappedFlowRateFvPatchVectorField& ptf, diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C index 6892a8c1b1..8d6e92521b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,31 +45,6 @@ mappedVelocityFluxFixedValueFvPatchField {} -Foam::mappedVelocityFluxFixedValueFvPatchField:: -mappedVelocityFluxFixedValueFvPatchField -( - const mappedVelocityFluxFixedValueFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_) -{ - if (!isA(this->patch().patch())) - { - FatalErrorInFunction - << "Patch type '" << p.type() - << "' not type '" << mappedPatchBase::typeName << "'" - << " for patch " << p.name() - << " of field " << internalField().name() - << " in file " << internalField().objectPath() - << exit(FatalError); - } -} - - Foam::mappedVelocityFluxFixedValueFvPatchField:: mappedVelocityFluxFixedValueFvPatchField ( @@ -109,6 +84,31 @@ mappedVelocityFluxFixedValueFvPatchField } +Foam::mappedVelocityFluxFixedValueFvPatchField:: +mappedVelocityFluxFixedValueFvPatchField +( + const mappedVelocityFluxFixedValueFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_) +{ + if (!isA(this->patch().patch())) + { + FatalErrorInFunction + << "Patch type '" << p.type() + << "' not type '" << mappedPatchBase::typeName << "'" + << " for patch " << p.name() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() + << exit(FatalError); + } +} + + Foam::mappedVelocityFluxFixedValueFvPatchField:: mappedVelocityFluxFixedValueFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C index abdfd64984..86b0cae65f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,20 +43,6 @@ Foam::outletInletFvPatchField::outletInletFvPatchField } -template -Foam::outletInletFvPatchField::outletInletFvPatchField -( - const outletInletFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - phiName_(ptf.phiName_) -{} - - template Foam::outletInletFvPatchField::outletInletFvPatchField ( @@ -87,6 +73,20 @@ Foam::outletInletFvPatchField::outletInletFvPatchField } +template +Foam::outletInletFvPatchField::outletInletFvPatchField +( + const outletInletFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + phiName_(ptf.phiName_) +{} + + template Foam::outletInletFvPatchField::outletInletFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C index ee461656ba..5496353deb 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,21 +48,6 @@ outletPhaseMeanVelocityFvPatchVectorField } -Foam::outletPhaseMeanVelocityFvPatchVectorField:: -outletPhaseMeanVelocityFvPatchVectorField -( - const outletPhaseMeanVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchField(ptf, p, iF, mapper), - UnMean_(ptf.UnMean_, false), - alphaName_(ptf.alphaName_) -{} - - Foam::outletPhaseMeanVelocityFvPatchVectorField:: outletPhaseMeanVelocityFvPatchVectorField ( @@ -93,6 +78,21 @@ outletPhaseMeanVelocityFvPatchVectorField } +Foam::outletPhaseMeanVelocityFvPatchVectorField:: +outletPhaseMeanVelocityFvPatchVectorField +( + const outletPhaseMeanVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField(ptf, p, iF, mapper), + UnMean_(ptf.UnMean_, false), + alphaName_(ptf.alphaName_) +{} + + Foam::outletPhaseMeanVelocityFvPatchVectorField:: outletPhaseMeanVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C index 1fe5971c63..63544a5672 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,20 +40,6 @@ Foam::partialSlipFvPatchField::partialSlipFvPatchField {} -template -Foam::partialSlipFvPatchField::partialSlipFvPatchField -( - const partialSlipFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - transformFvPatchField(ptf, p, iF, mapper), - valueFraction_(mapper(ptf.valueFraction_)) -{} - - template Foam::partialSlipFvPatchField::partialSlipFvPatchField ( @@ -69,6 +55,20 @@ Foam::partialSlipFvPatchField::partialSlipFvPatchField } +template +Foam::partialSlipFvPatchField::partialSlipFvPatchField +( + const partialSlipFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + transformFvPatchField(ptf, p, iF, mapper), + valueFraction_(mapper(ptf.valueFraction_)) +{} + + template Foam::partialSlipFvPatchField::partialSlipFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 88d226d778..0ac6df6e40 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,22 +49,6 @@ pressureDirectedInletOutletVelocityFvPatchVectorField } -Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: -pressureDirectedInletOutletVelocityFvPatchVectorField -( - const pressureDirectedInletOutletVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_), - inletDir_(mapper(ptf.inletDir_)) -{} - - Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( @@ -85,6 +69,22 @@ pressureDirectedInletOutletVelocityFvPatchVectorField } +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: +pressureDirectedInletOutletVelocityFvPatchVectorField +( + const pressureDirectedInletOutletVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + rhoName_(ptf.rhoName_), + inletDir_(mapper(ptf.inletDir_)) +{} + + Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index abcb483a07..415371bc6b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,6 +46,21 @@ pressureDirectedInletVelocityFvPatchVectorField {} +Foam::pressureDirectedInletVelocityFvPatchVectorField:: +pressureDirectedInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + phiName_(dict.lookupOrDefault("phi", "phi")), + rhoName_(dict.lookupOrDefault("rho", "rho")), + inletDir_("inletDirection", dict, p.size()) +{} + + Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( @@ -62,21 +77,6 @@ pressureDirectedInletVelocityFvPatchVectorField {} -Foam::pressureDirectedInletVelocityFvPatchVectorField:: -pressureDirectedInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - phiName_(dict.lookupOrDefault("phi", "phi")), - rhoName_(dict.lookupOrDefault("rho", "rho")), - inletDir_("inletDirection", dict, p.size()) -{} - - Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index 57f11dfba6..77afb62ca3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,21 +49,6 @@ pressureInletOutletParSlipVelocityFvPatchVectorField } -Foam::pressureInletOutletParSlipVelocityFvPatchVectorField:: -pressureInletOutletParSlipVelocityFvPatchVectorField -( - const pressureInletOutletParSlipVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_) -{} - - Foam::pressureInletOutletParSlipVelocityFvPatchVectorField:: pressureInletOutletParSlipVelocityFvPatchVectorField ( @@ -83,6 +68,21 @@ pressureInletOutletParSlipVelocityFvPatchVectorField } +Foam::pressureInletOutletParSlipVelocityFvPatchVectorField:: +pressureInletOutletParSlipVelocityFvPatchVectorField +( + const pressureInletOutletParSlipVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + rhoName_(ptf.rhoName_) +{} + + Foam::pressureInletOutletParSlipVelocityFvPatchVectorField:: pressureInletOutletParSlipVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C index e703a75ed6..b9a141b60c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,6 +47,21 @@ pressureInletOutletVelocityFvPatchVectorField } +Foam::pressureInletOutletVelocityFvPatchVectorField:: +pressureInletOutletVelocityFvPatchVectorField +( + const pressureInletOutletVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + directionMixedFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + tangentialVelocity_(ptf.tangentialVelocity_, false) +{} + + Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( @@ -72,21 +87,6 @@ pressureInletOutletVelocityFvPatchVectorField } -Foam::pressureInletOutletVelocityFvPatchVectorField:: -pressureInletOutletVelocityFvPatchVectorField -( - const pressureInletOutletVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - directionMixedFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - tangentialVelocity_(ptf.tangentialVelocity_, false) -{} - - Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C index f14a2296e8..f457c07d5a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,6 +41,18 @@ pressureInletUniformVelocityFvPatchVectorField {} +Foam::pressureInletUniformVelocityFvPatchVectorField:: +pressureInletUniformVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + pressureInletVelocityFvPatchVectorField(p, iF, dict) +{} + + Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( @@ -54,18 +66,6 @@ pressureInletUniformVelocityFvPatchVectorField {} -Foam::pressureInletUniformVelocityFvPatchVectorField:: -pressureInletUniformVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - pressureInletVelocityFvPatchVectorField(p, iF, dict) -{} - - Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index 9ac2c2f0cc..c1ffa87df2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,20 @@ pressureInletVelocityFvPatchVectorField {} +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchVectorField(p, iF, dict), + phiName_(dict.lookupOrDefault("phi", "phi")), + rhoName_(dict.lookupOrDefault("rho", "rho")) +{} + + Foam::pressureInletVelocityFvPatchVectorField:: pressureInletVelocityFvPatchVectorField ( @@ -58,20 +72,6 @@ pressureInletVelocityFvPatchVectorField {} -Foam::pressureInletVelocityFvPatchVectorField:: -pressureInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchVectorField(p, iF, dict), - phiName_(dict.lookupOrDefault("phi", "phi")), - rhoName_(dict.lookupOrDefault("rho", "rho")) -{} - - Foam::pressureInletVelocityFvPatchVectorField:: pressureInletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 4938935b00..4dca9f19a2 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,21 +49,6 @@ pressureNormalInletOutletVelocityFvPatchVectorField } -Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: -pressureNormalInletOutletVelocityFvPatchVectorField -( - const pressureNormalInletOutletVelocityFvPatchVectorField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchVectorField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - rhoName_(ptf.rhoName_) -{} - - Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( @@ -83,6 +68,21 @@ pressureNormalInletOutletVelocityFvPatchVectorField } +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: +pressureNormalInletOutletVelocityFvPatchVectorField +( + const pressureNormalInletOutletVelocityFvPatchVectorField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchVectorField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + rhoName_(ptf.rhoName_) +{} + + Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C index ae0b80dff2..4ec049050e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,14 +64,13 @@ rotatingPressureInletOutletVelocityFvPatchVectorField Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( - const rotatingPressureInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper + const dictionary& dict ) : - pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper), - omega_(ptf.omega_, false) + pressureInletOutletVelocityFvPatchVectorField(p, iF, dict), + omega_(Function1::New("omega", dict)) { calcTangentialVelocity(); } @@ -80,13 +79,14 @@ rotatingPressureInletOutletVelocityFvPatchVectorField Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( + const rotatingPressureInletOutletVelocityFvPatchVectorField& ptf, const fvPatch& p, const DimensionedField& iF, - const dictionary& dict + const fvPatchFieldMapper& mapper ) : - pressureInletOutletVelocityFvPatchVectorField(p, iF, dict), - omega_(Function1::New("omega", dict)) + pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper), + omega_(ptf.omega_, false) { calcTangentialVelocity(); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C index 4ae9050f91..b1fb71ecc6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,6 +44,23 @@ swirlInletVelocityFvPatchVectorField {} +Foam::swirlInletVelocityFvPatchVectorField:: +swirlInletVelocityFvPatchVectorField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + origin_(dict.lookup("origin")), + axis_(dict.lookup("axis")), + axialVelocity_(Function1::New("axialVelocity", dict)), + radialVelocity_(Function1::New("radialVelocity", dict)), + tangentialVelocity_(Function1::New("tangentialVelocity", dict)) +{} + + Foam::swirlInletVelocityFvPatchVectorField:: swirlInletVelocityFvPatchVectorField ( @@ -62,23 +79,6 @@ swirlInletVelocityFvPatchVectorField {} -Foam::swirlInletVelocityFvPatchVectorField:: -swirlInletVelocityFvPatchVectorField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - origin_(dict.lookup("origin")), - axis_(dict.lookup("axis")), - axialVelocity_(Function1::New("axialVelocity", dict)), - radialVelocity_(Function1::New("radialVelocity", dict)), - tangentialVelocity_(Function1::New("tangentialVelocity", dict)) -{} - - Foam::swirlInletVelocityFvPatchVectorField:: swirlInletVelocityFvPatchVectorField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C index 5cdcc8cb0f..f213ae9c2c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,23 +46,6 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField {} -Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField -( - const totalTemperatureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchScalarField(ptf, p, iF, mapper), - UName_(ptf.UName_), - phiName_(ptf.phiName_), - psiName_(ptf.psiName_), - gamma_(ptf.gamma_), - T0_(mapper(ptf.T0_)) -{} - - Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField ( const fvPatch& p, @@ -91,6 +74,23 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField } +Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField +( + const totalTemperatureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + UName_(ptf.UName_), + phiName_(ptf.phiName_), + psiName_(ptf.psiName_), + gamma_(ptf.gamma_), + T0_(mapper(ptf.T0_)) +{} + + Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField ( const totalTemperatureFvPatchScalarField& tppsf, diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C index 3eb21c0c78..0ef1394c8b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,19 +47,6 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField this->valueFraction() = 0.0; } -Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField:: -turbulentIntensityKineticEnergyInletFvPatchScalarField -( - const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchScalarField(ptf, p, iF, mapper), - intensity_(ptf.intensity_), - UName_(ptf.UName_) -{} Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField:: turbulentIntensityKineticEnergyInletFvPatchScalarField @@ -95,6 +82,21 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField } +Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField:: +turbulentIntensityKineticEnergyInletFvPatchScalarField +( + const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchScalarField(ptf, p, iF, mapper), + intensity_(ptf.intensity_), + UName_(ptf.UName_) +{} + + Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField:: turbulentIntensityKineticEnergyInletFvPatchScalarField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C index 42e25d8914..6abd94e559 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,20 +39,6 @@ Foam::uniformJumpFvPatchField::uniformJumpFvPatchField {} -template -Foam::uniformJumpFvPatchField::uniformJumpFvPatchField -( - const uniformJumpFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedJumpFvPatchField(ptf, p, iF, mapper), - jumpTable_(ptf.jumpTable_, false) -{} - - template Foam::uniformJumpFvPatchField::uniformJumpFvPatchField ( @@ -83,6 +69,20 @@ Foam::uniformJumpFvPatchField::uniformJumpFvPatchField } +template +Foam::uniformJumpFvPatchField::uniformJumpFvPatchField +( + const uniformJumpFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpFvPatchField(ptf, p, iF, mapper), + jumpTable_(ptf.jumpTable_, false) +{} + + template Foam::uniformJumpFvPatchField::uniformJumpFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C index 0f983bf1f2..3edb775c53 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,20 +39,6 @@ Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField {} -template -Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField -( - const uniformJumpAMIFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedJumpAMIFvPatchField(ptf, p, iF, mapper), - jumpTable_(ptf.jumpTable_, false) -{} - - template Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField ( @@ -80,6 +66,20 @@ Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField } +template +Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField +( + const uniformJumpAMIFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpAMIFvPatchField(ptf, p, iF, mapper), + jumpTable_(ptf.jumpTable_, false) +{} + + template Foam::uniformJumpAMIFvPatchField::uniformJumpAMIFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C index 7ca05f58f3..f155d314e0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,22 +49,6 @@ variableHeightFlowRateFvPatchScalarField } -Foam::variableHeightFlowRateFvPatchScalarField:: -variableHeightFlowRateFvPatchScalarField -( - const variableHeightFlowRateFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - mixedFvPatchScalarField(ptf, p, iF, mapper), - phiName_(ptf.phiName_), - lowerBound_(ptf.lowerBound_), - upperBound_(ptf.upperBound_) -{} - - Foam::variableHeightFlowRateFvPatchScalarField:: variableHeightFlowRateFvPatchScalarField ( @@ -97,6 +81,22 @@ variableHeightFlowRateFvPatchScalarField } +Foam::variableHeightFlowRateFvPatchScalarField:: +variableHeightFlowRateFvPatchScalarField +( + const variableHeightFlowRateFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchScalarField(ptf, p, iF, mapper), + phiName_(ptf.phiName_), + lowerBound_(ptf.lowerBound_), + upperBound_(ptf.upperBound_) +{} + + Foam::variableHeightFlowRateFvPatchScalarField:: variableHeightFlowRateFvPatchScalarField ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C index 9fcf26e07c..3c09e6dc66 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,6 +46,20 @@ Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField {} +template +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + advectiveFvPatchField(p, iF, dict), + psiName_(dict.lookupOrDefault("psi", "thermo:psi")), + gamma_(dict.lookup("gamma")) +{} + + template Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( @@ -61,20 +75,6 @@ Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField {} -template -Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - advectiveFvPatchField(p, iF, dict), - psiName_(dict.lookupOrDefault("psi", "thermo:psi")), - gamma_(dict.lookup("gamma")) -{} - - template Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index 66ffa93917..edc0b806ed 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -486,6 +486,6 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const fvPatchField& ptf) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #include "fvPatchFieldNew.C" +#include "fvPatchFieldNew.C" // ************************************************************************* // diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C index 61614ef1f2..7aa89d21c1 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C @@ -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-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,18 @@ Foam::cellMotionFvPatchField::cellMotionFvPatchField {} +template +Foam::cellMotionFvPatchField::cellMotionFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict) +{} + + template Foam::cellMotionFvPatchField::cellMotionFvPatchField ( @@ -55,18 +67,6 @@ Foam::cellMotionFvPatchField::cellMotionFvPatchField {} -template -Foam::cellMotionFvPatchField::cellMotionFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict) -{} - - template Foam::cellMotionFvPatchField::cellMotionFvPatchField (