fvPatchFields: Reordered constructor definitions to match declarations

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}
 (

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}
 (

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}
 (

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<Type>::basicSymmetryFvPatchField
 {}
 
 
-template<class Type>
-Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
-(
-    const basicSymmetryFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    transformFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
 template<class Type>
 Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 (
@@ -67,6 +54,19 @@ Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 }
 
 
+template<class Type>
+Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
+(
+    const basicSymmetryFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    transformFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
 template<class Type>
 Foam::basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 (

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<Type>::coupledFvPatchField
 {}
 
 
+template<class Type>
+Foam::coupledFvPatchField<Type>::coupledFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict,
+    const bool valueRequired
+)
+:
+    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
+    fvPatchField<Type>(p, iF, dict, valueRequired)
+{}
+
+
 template<class Type>
 Foam::coupledFvPatchField<Type>::coupledFvPatchField
 (
@@ -67,20 +81,6 @@ Foam::coupledFvPatchField<Type>::coupledFvPatchField
 {}
 
 
-template<class Type>
-Foam::coupledFvPatchField<Type>::coupledFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict,
-    const bool valueRequired
-)
-:
-    LduInterfaceField<Type>(refCast<const lduInterface>(p)),
-    fvPatchField<Type>(p, iF, dict, valueRequired)
-{}
-
-
 template<class Type>
 Foam::coupledFvPatchField<Type>::coupledFvPatchField
 (

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<Type>::directionMixedFvPatchField
 {}
 
 
+template<class Type>
+Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    transformFvPatchField<Type>(p, iF, dict),
+    refValue_("refValue", dict, p.size()),
+    refGrad_("refGradient", dict, p.size()),
+    valueFraction_("valueFraction", dict, p.size())
+{
+    evaluate();
+}
+
+
 template<class Type>
 Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
 (
@@ -68,23 +85,6 @@ Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
 }
 
 
-template<class Type>
-Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    transformFvPatchField<Type>(p, iF, dict),
-    refValue_("refValue", dict, p.size()),
-    refGrad_("refGradient", dict, p.size()),
-    valueFraction_("valueFraction", dict, p.size())
-{
-    evaluate();
-}
-
-
 template<class Type>
 Foam::directionMixedFvPatchField<Type>::directionMixedFvPatchField
 (

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<Type>::transformFvPatchField
 {}
 
 
+template<class Type>
+Foam::transformFvPatchField<Type>::transformFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fvPatchField<Type>(p, iF, dict, false)
+{}
+
+
 template<class Type>
 Foam::transformFvPatchField<Type>::transformFvPatchField
 (
@@ -53,18 +65,6 @@ Foam::transformFvPatchField<Type>::transformFvPatchField
 {}
 
 
-template<class Type>
-Foam::transformFvPatchField<Type>::transformFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fvPatchField<Type>(p, iF, dict, false)
-{}
-
-
 template<class Type>
 Foam::transformFvPatchField<Type>::transformFvPatchField
 (

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<Type>::cyclicSlipFvPatchField
 {}
 
 
+template<class Type>
+Foam::cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    cyclicFvPatchField<Type>(p, iF, dict)
+{}
+
+
 template<class Type>
 Foam::cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
 (
@@ -51,18 +63,6 @@ Foam::cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
 {}
 
 
-template<class Type>
-Foam::cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    cyclicFvPatchField<Type>(p, iF, dict)
-{}
-
-
 template<class Type>
 Foam::cyclicSlipFvPatchField<Type>::cyclicSlipFvPatchField
 (

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<Type>::emptyFvPatchField
 {}
 
 
-template<class Type>
-Foam::emptyFvPatchField<Type>::emptyFvPatchField
-(
-    const emptyFvPatchField<Type>&,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper&
-)
-:
-    fvPatchField<Type>(p, iF, Field<Type>(0))
-{
-    if (!isType<emptyFvPatch>(p))
-    {
-        FatalErrorInFunction
-            << "' not constraint type '" << typeName << "'"
-            << "\n    for patch " << p.name()
-            << " of field " << this->internalField().name()
-            << " in file " << this->internalField().objectPath()
-            << exit(FatalIOError);
-    }
-}
-
-
 template<class Type>
 Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
@@ -87,6 +64,29 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
 }
 
 
+template<class Type>
+Foam::emptyFvPatchField<Type>::emptyFvPatchField
+(
+    const emptyFvPatchField<Type>&,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper&
+)
+:
+    fvPatchField<Type>(p, iF, Field<Type>(0))
+{
+    if (!isType<emptyFvPatch>(p))
+    {
+        FatalErrorInFunction
+            << "' not constraint type '" << typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << this->internalField().name()
+            << " in file " << this->internalField().objectPath()
+            << exit(FatalError);
+    }
+}
+
+
 template<class Type>
 Foam::emptyFvPatchField<Type>::emptyFvPatchField
 (
@@ -98,14 +98,4 @@ Foam::emptyFvPatchField<Type>::emptyFvPatchField
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::emptyFvPatchField<Type>::updateCoeffs()
-{
-    // Check moved to checkMesh.
-    // Test here fails if multiple empty patches.
-}
-
-
 // ************************************************************************* //

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<Field<Type>> valueInternalCoeffs

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<Type>::jumpCyclicFvPatchField
 {}
 
 
-template<class Type>
-Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
-(
-    const jumpCyclicFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    cyclicFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
 template<class Type>
 Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
 (
@@ -66,6 +53,19 @@ Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
 }
 
 
+template<class Type>
+Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
+(
+    const jumpCyclicFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    cyclicFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
 template<class Type>
 Foam::jumpCyclicFvPatchField<Type>::jumpCyclicFvPatchField
 (

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<Type>::jumpCyclicAMIFvPatchField
 {}
 
 
-template<class Type>
-Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
-(
-    const jumpCyclicAMIFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    cyclicAMIFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
 template<class Type>
 Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
 (
@@ -67,6 +54,19 @@ Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
 }
 
 
+template<class Type>
+Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
+(
+    const jumpCyclicAMIFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    cyclicAMIFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
 template<class Type>
 Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
 (

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<Type>::symmetryPlaneFvPatchField
 {}
 
 
-template<class Type>
-Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
-(
-    const symmetryPlaneFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper),
-    symmetryPlanePatch_(refCast<const symmetryPlaneFvPatch>(p))
-{
-    if (!isType<symmetryPlaneFvPatch>(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<class Type>
 Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 (
@@ -90,6 +66,30 @@ Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 }
 
 
+template<class Type>
+Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
+(
+    const symmetryPlaneFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper),
+    symmetryPlanePatch_(refCast<const symmetryPlaneFvPatch>(p))
+{
+    if (!isType<symmetryPlaneFvPatch>(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<class Type>
 Foam::symmetryPlaneFvPatchField<Type>::symmetryPlaneFvPatchField
 (

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<Type>::wedgeFvPatchField
 {}
 
 
-template<class Type>
-Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
-(
-    const wedgeFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    transformFvPatchField<Type>(ptf, p, iF, mapper)
-{
-    if (!isType<wedgeFvPatch>(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<class Type>
 Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 (
@@ -93,6 +70,29 @@ Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 }
 
 
+template<class Type>
+Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
+(
+    const wedgeFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    transformFvPatchField<Type>(ptf, p, iF, mapper)
+{
+    if (!isType<wedgeFvPatch>(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<class Type>
 Foam::wedgeFvPatchField<Type>::wedgeFvPatchField
 (

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<vector, volMesh>& 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<vector, volMesh>& 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
 (

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<vector, volMesh>& 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<vector, volMesh>& 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
 (

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<Type>::advectiveFvPatchField
 }
 
 
-template<class Type>
-Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
-(
-    const advectiveFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_),
-    fieldInf_(ptf.fieldInf_),
-    lInf_(ptf.lInf_)
-{}
-
-
 template<class Type>
 Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
 (
@@ -120,6 +103,23 @@ Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
 }
 
 
+template<class Type>
+Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
+(
+    const advectiveFvPatchField& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    fieldInf_(ptf.fieldInf_),
+    lInf_(ptf.lInf_)
+{}
+
+
 template<class Type>
 Foam::advectiveFvPatchField<Type>::advectiveFvPatchField
 (

src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C

@@ -115,21 +115,6 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 {}
 
 
-template<class Type>
-Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
-(
-    const codedFixedValueFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
-    codedBase(ptf),
-    redirectPatchFieldPtr_()
-{}
-
-
 template<class Type>
 Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 (
@@ -146,6 +131,21 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 }
 
 
+template<class Type>
+Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
+(
+    const codedFixedValueFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+    codedBase(ptf),
+    redirectPatchFieldPtr_()
+{}
+
+
 template<class Type>
 Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
 (

src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C

@@ -115,21 +115,6 @@ Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
 {}
 
 
-template<class Type>
-Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
-(
-    const codedMixedFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(ptf, p, iF, mapper),
-    codedBase(ptf),
-    redirectPatchFieldPtr_()
-{}
-
-
 template<class Type>
 Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
 (
@@ -146,6 +131,21 @@ Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
 }
 
 
+template<class Type>
+Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
+(
+    const codedMixedFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    codedBase(ptf),
+    redirectPatchFieldPtr_()
+{}
+
+
 template<class Type>
 Foam::codedMixedFvPatchField<Type>::codedMixedFvPatchField
 (

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    origin_(dict.lookup("origin")),
+    axis_(dict.lookup("axis")),
+    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
+    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
+    rpm_(Function1<scalar>::New("rpm", dict))
+{}
+
+
 Foam::cylindricalInletVelocityFvPatchVectorField::
 cylindricalInletVelocityFvPatchVectorField
 (
@@ -66,23 +83,6 @@ cylindricalInletVelocityFvPatchVectorField
 {}
 
 
-Foam::cylindricalInletVelocityFvPatchVectorField::
-cylindricalInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    origin_(dict.lookup("origin")),
-    axis_(dict.lookup("axis")),
-    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
-    rpm_(Function1<scalar>::New("rpm", dict))
-{}
-
-
 Foam::cylindricalInletVelocityFvPatchVectorField::
 cylindricalInletVelocityFvPatchVectorField
 (

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<class Type>
-Foam::externalCoupledMixedFvPatchField<Type>::
-externalCoupledMixedFvPatchField
-(
-    const externalCoupledMixedFvPatchField& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(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<class Type>
 Foam::externalCoupledMixedFvPatchField<Type>::
 externalCoupledMixedFvPatchField
@@ -540,6 +515,31 @@ externalCoupledMixedFvPatchField
 }
 
 
+template<class Type>
+Foam::externalCoupledMixedFvPatchField<Type>::
+externalCoupledMixedFvPatchField
+(
+    const externalCoupledMixedFvPatchField& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(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<class Type>
 Foam::externalCoupledMixedFvPatchField<Type>::
 externalCoupledMixedFvPatchField

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<Type>::fixedInternalValueFvPatchField
 {}
 
 
+template<class Type>
+Foam::fixedInternalValueFvPatchField<Type>::fixedInternalValueFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF, dict)
+{}
+
+
 template<class Type>
 Foam::fixedInternalValueFvPatchField<Type>::fixedInternalValueFvPatchField
 (
@@ -53,18 +65,6 @@ Foam::fixedInternalValueFvPatchField<Type>::fixedInternalValueFvPatchField
 {}
 
 
-template<class Type>
-Foam::fixedInternalValueFvPatchField<Type>::fixedInternalValueFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    zeroGradientFvPatchField<Type>(p, iF, dict)
-{}
-
-
 template<class Type>
 Foam::fixedInternalValueFvPatchField<Type>::fixedInternalValueFvPatchField
 (

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<Type>::fixedJumpFvPatchField
 {}
 
 
-template<class Type>
-Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
-(
-    const fixedJumpFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    jumpCyclicFvPatchField<Type>(ptf, p, iF, mapper),
-    jump_(mapper(ptf.jump_))
-{}
-
-
 template<class Type>
 Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 (
@@ -83,6 +69,20 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 }
 
 
+template<class Type>
+Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
+(
+    const fixedJumpFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    jumpCyclicFvPatchField<Type>(ptf, p, iF, mapper),
+    jump_(mapper(ptf.jump_))
+{}
+
+
 template<class Type>
 Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
 (

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<Type>::fixedJumpAMIFvPatchField
 {}
 
 
-template<class Type>
-Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
-(
-    const fixedJumpAMIFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    jumpCyclicAMIFvPatchField<Type>(ptf, p, iF, mapper),
-    jump_(mapper(ptf.jump_))
-{}
-
-
 template<class Type>
 Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 (
@@ -83,6 +69,20 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 }
 
 
+template<class Type>
+Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
+(
+    const fixedJumpAMIFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    jumpCyclicAMIFvPatchField<Type>(ptf, p, iF, mapper),
+    jump_(mapper(ptf.jump_))
+{}
+
+
 template<class Type>
 Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
 (

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<Type>::fixedNormalSlipFvPatchField
 {}
 
 
-template<class Type>
-Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
-(
-    const fixedNormalSlipFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    transformFvPatchField<Type>(ptf, p, iF, mapper),
-    fixedValue_(mapper(ptf.fixedValue_))
-{}
-
-
 template<class Type>
 Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
 (
@@ -70,6 +56,20 @@ Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
 }
 
 
+template<class Type>
+Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
+(
+    const fixedNormalSlipFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    transformFvPatchField<Type>(ptf, p, iF, mapper),
+    fixedValue_(mapper(ptf.fixedValue_))
+{}
+
+
 template<class Type>
 Foam::fixedNormalSlipFvPatchField<Type>::fixedNormalSlipFvPatchField
 (

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<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF, dict),
+    pName_(dict.lookupOrDefault<word>("p", "p"))
+{}
+
+
 Foam::fixedPressureCompressibleDensityFvPatchScalarField::
 fixedPressureCompressibleDensityFvPatchScalarField
 (
@@ -57,19 +70,6 @@ fixedPressureCompressibleDensityFvPatchScalarField
 {}
 
 
-Foam::fixedPressureCompressibleDensityFvPatchScalarField::
-fixedPressureCompressibleDensityFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<scalar>(p, iF, dict),
-    pName_(dict.lookupOrDefault<word>("p", "p"))
-{}
-
-
 Foam::fixedPressureCompressibleDensityFvPatchScalarField::
 fixedPressureCompressibleDensityFvPatchScalarField
 (

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<vector, volMesh>& 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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    zeroGradientFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
+{}
+
+
 Foam::fluxCorrectedVelocityFvPatchVectorField::
 fluxCorrectedVelocityFvPatchVectorField
 (

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<Type>::inletOutletFvPatchField
 }
 
 
-template<class Type>
-Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
-(
-    const inletOutletFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_)
-{}
-
-
 template<class Type>
 Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (
@@ -87,6 +73,20 @@ Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 }
 
 
+template<class Type>
+Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
+(
+    const inletOutletFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_)
+{}
+
+
 template<class Type>
 Foam::inletOutletFvPatchField<Type>::inletOutletFvPatchField
 (

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<scalar, volMesh>& 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<scalar, volMesh>& 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
 (

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF, dict),
+    inletVelocity_("inletVelocity", dict, p.size()),
+    alphaName_(dict.lookupOrDefault<word>("alpha", "alpha"))
+{}
+
+
 Foam::interstitialInletVelocityFvPatchVectorField::
 interstitialInletVelocityFvPatchVectorField
 (
@@ -59,20 +73,6 @@ interstitialInletVelocityFvPatchVectorField
 {}
 
 
-Foam::interstitialInletVelocityFvPatchVectorField::
-interstitialInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF, dict),
-    inletVelocity_("inletVelocity", dict, p.size()),
-    alphaName_(dict.lookupOrDefault<word>("alpha", "alpha"))
-{}
-
-
 Foam::interstitialInletVelocityFvPatchVectorField::
 interstitialInletVelocityFvPatchVectorField
 (

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<class Type>
 Foam::mappedFixedInternalValueFvPatchField<Type>::
 mappedFixedInternalValueFvPatchField
 (
-    const mappedFixedInternalValueFvPatchField<Type>& ptf,
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
+    const dictionary& dict
 )
 :
-    mappedFixedValueFvPatchField<Type>(ptf, p, iF, mapper)
+    mappedFixedValueFvPatchField<Type>(p, iF, dict)
 {}
 
 
@@ -58,12 +57,13 @@ template<class Type>
 Foam::mappedFixedInternalValueFvPatchField<Type>::
 mappedFixedInternalValueFvPatchField
 (
+    const mappedFixedInternalValueFvPatchField<Type>& ptf,
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
+    const fvPatchFieldMapper& mapper
 )
 :
-    mappedFixedValueFvPatchField<Type>(p, iF, dict)
+    mappedFixedValueFvPatchField<Type>(ptf, p, iF, mapper)
 {}
 
 

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    nbrPhiName_(dict.lookupOrDefault<word>("nbrPhi", "phi")),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
+{}
+
+
 Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField
 (
     const mappedFlowRateFvPatchVectorField& ptf,
@@ -60,20 +74,6 @@ Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField
 {}
 
 
-Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    nbrPhiName_(dict.lookupOrDefault<word>("nbrPhi", "phi")),
-    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{}
-
-
 Foam::mappedFlowRateFvPatchVectorField::mappedFlowRateFvPatchVectorField
 (
     const mappedFlowRateFvPatchVectorField& ptf,

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<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_)
-{
-    if (!isA<mappedPatchBase>(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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_)
+{
+    if (!isA<mappedPatchBase>(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
 (

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<Type>::outletInletFvPatchField
 }
 
 
-template<class Type>
-Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
-(
-    const outletInletFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<Type>(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_)
-{}
-
-
 template<class Type>
 Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (
@@ -87,6 +73,20 @@ Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 }
 
 
+template<class Type>
+Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
+(
+    const outletInletFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_)
+{}
+
+
 template<class Type>
 Foam::outletInletFvPatchField<Type>::outletInletFvPatchField
 (

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<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    mixedFvPatchField<vector>(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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<vector>(ptf, p, iF, mapper),
+    UnMean_(ptf.UnMean_, false),
+    alphaName_(ptf.alphaName_)
+{}
+
+
 Foam::outletPhaseMeanVelocityFvPatchVectorField::
 outletPhaseMeanVelocityFvPatchVectorField
 (

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<Type>::partialSlipFvPatchField
 {}
 
 
-template<class Type>
-Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
-(
-    const partialSlipFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    transformFvPatchField<Type>(ptf, p, iF, mapper),
-    valueFraction_(mapper(ptf.valueFraction_))
-{}
-
-
 template<class Type>
 Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
 (
@@ -69,6 +55,20 @@ Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
 }
 
 
+template<class Type>
+Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
+(
+    const partialSlipFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    transformFvPatchField<Type>(ptf, p, iF, mapper),
+    valueFraction_(mapper(ptf.valueFraction_))
+{}
+
+
 template<class Type>
 Foam::partialSlipFvPatchField<Type>::partialSlipFvPatchField
 (

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<vector, volMesh>& 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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    inletDir_(mapper(ptf.inletDir_))
+{}
+
+
 Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::
 pressureDirectedInletOutletVelocityFvPatchVectorField
 (

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF, dict),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    inletDir_("inletDirection", dict, p.size())
+{}
+
+
 Foam::pressureDirectedInletVelocityFvPatchVectorField::
 pressureDirectedInletVelocityFvPatchVectorField
 (
@@ -62,21 +77,6 @@ pressureDirectedInletVelocityFvPatchVectorField
 {}
 
 
-Foam::pressureDirectedInletVelocityFvPatchVectorField::
-pressureDirectedInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF, dict),
-    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    inletDir_("inletDirection", dict, p.size())
-{}
-
-
 Foam::pressureDirectedInletVelocityFvPatchVectorField::
 pressureDirectedInletVelocityFvPatchVectorField
 (

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<vector, volMesh>& 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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
+{}
+
+
 Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::
 pressureInletOutletParSlipVelocityFvPatchVectorField
 (

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<vector, volMesh>& 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<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    directionMixedFvPatchVectorField(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_),
-    tangentialVelocity_(ptf.tangentialVelocity_, false)
-{}
-
-
 Foam::pressureInletOutletVelocityFvPatchVectorField::
 pressureInletOutletVelocityFvPatchVectorField
 (

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    pressureInletVelocityFvPatchVectorField(p, iF, dict)
+{}
+
+
 Foam::pressureInletUniformVelocityFvPatchVectorField::
 pressureInletUniformVelocityFvPatchVectorField
 (
@@ -54,18 +66,6 @@ pressureInletUniformVelocityFvPatchVectorField
 {}
 
 
-Foam::pressureInletUniformVelocityFvPatchVectorField::
-pressureInletUniformVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    pressureInletVelocityFvPatchVectorField(p, iF, dict)
-{}
-
-
 Foam::pressureInletUniformVelocityFvPatchVectorField::
 pressureInletUniformVelocityFvPatchVectorField
 (

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF, dict),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
+{}
+
+
 Foam::pressureInletVelocityFvPatchVectorField::
 pressureInletVelocityFvPatchVectorField
 (
@@ -58,20 +72,6 @@ pressureInletVelocityFvPatchVectorField
 {}
 
 
-Foam::pressureInletVelocityFvPatchVectorField::
-pressureInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchVectorField(p, iF, dict),
-    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
-{}
-
-
 Foam::pressureInletVelocityFvPatchVectorField::
 pressureInletVelocityFvPatchVectorField
 (

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<vector, volMesh>& 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<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
+{}
+
+
 Foam::pressureNormalInletOutletVelocityFvPatchVectorField::
 pressureNormalInletOutletVelocityFvPatchVectorField
 (

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<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
+    const dictionary& dict
 )
 :
-    pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper),
+    pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
-    omega_(ptf.omega_, false)
+    omega_(Function1<vector>::New("omega", dict))
 {
     calcTangentialVelocity();
 }
@@ -80,13 +79,14 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::
 rotatingPressureInletOutletVelocityFvPatchVectorField
 (
+    const rotatingPressureInletOutletVelocityFvPatchVectorField& ptf,
     const fvPatch& p,
     const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
+    const fvPatchFieldMapper& mapper
 )
 :
-    pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
+    pressureInletOutletVelocityFvPatchVectorField(ptf, p, iF, mapper),
-    omega_(Function1<vector>::New("omega", dict))
+    omega_(ptf.omega_, false)
 {
     calcTangentialVelocity();
 }

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<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<vector>(p, iF, dict),
+    origin_(dict.lookup("origin")),
+    axis_(dict.lookup("axis")),
+    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
+    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
+    tangentialVelocity_(Function1<scalar>::New("tangentialVelocity", dict))
+{}
+
+
 Foam::swirlInletVelocityFvPatchVectorField::
 swirlInletVelocityFvPatchVectorField
 (
@@ -62,23 +79,6 @@ swirlInletVelocityFvPatchVectorField
 {}
 
 
-Foam::swirlInletVelocityFvPatchVectorField::
-swirlInletVelocityFvPatchVectorField
-(
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<vector>(p, iF, dict),
-    origin_(dict.lookup("origin")),
-    axis_(dict.lookup("axis")),
-    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
-    tangentialVelocity_(Function1<scalar>::New("tangentialVelocity", dict))
-{}
-
-
 Foam::swirlInletVelocityFvPatchVectorField::
 swirlInletVelocityFvPatchVectorField
 (

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<scalar, volMesh>& 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<scalar, volMesh>& 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,

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<scalar, volMesh>& 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<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    inletOutletFvPatchScalarField(ptf, p, iF, mapper),
+    intensity_(ptf.intensity_),
+    UName_(ptf.UName_)
+{}
+
+
 Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (

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<Type>::uniformJumpFvPatchField
 {}
 
 
-template<class Type>
-Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
-(
-    const uniformJumpFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedJumpFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_, false)
-{}
-
-
 template<class Type>
 Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 (
@@ -83,6 +69,20 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 }
 
 
+template<class Type>
+Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
+(
+    const uniformJumpFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedJumpFvPatchField<Type>(ptf, p, iF, mapper),
+    jumpTable_(ptf.jumpTable_, false)
+{}
+
+
 template<class Type>
 Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
 (

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<Type>::uniformJumpAMIFvPatchField
 {}
 
 
-template<class Type>
-Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
-(
-    const uniformJumpAMIFvPatchField<Type>& ptf,
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedJumpAMIFvPatchField<Type>(ptf, p, iF, mapper),
-    jumpTable_(ptf.jumpTable_, false)
-{}
-
-
 template<class Type>
 Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 (
@@ -80,6 +66,20 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 }
 
 
+template<class Type>
+Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
+(
+    const uniformJumpAMIFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedJumpAMIFvPatchField<Type>(ptf, p, iF, mapper),
+    jumpTable_(ptf.jumpTable_, false)
+{}
+
+
 template<class Type>
 Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 (

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<scalar, volMesh>& 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<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    lowerBound_(ptf.lowerBound_),
+    upperBound_(ptf.upperBound_)
+{}
+
+
 Foam::variableHeightFlowRateFvPatchScalarField::
 variableHeightFlowRateFvPatchScalarField
 (

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<Type>::waveTransmissiveFvPatchField
 {}
 
 
+template<class Type>
+Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    advectiveFvPatchField<Type>(p, iF, dict),
+    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    gamma_(dict.lookup<scalar>("gamma"))
+{}
+
+
 template<class Type>
 Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
@@ -61,20 +75,6 @@ Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 {}
 
 
-template<class Type>
-Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    advectiveFvPatchField<Type>(p, iF, dict),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
-    gamma_(dict.lookup<scalar>("gamma"))
-{}
-
-
 template<class Type>
 Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (

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<Type>& ptf)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "fvPatchFieldNew.C"
+#include "fvPatchFieldNew.C"
 
 // ************************************************************************* //

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<Type>::cellMotionFvPatchField
 {}
 
 
+template<class Type>
+Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<Type>(p, iF, dict)
+{}
+
+
 template<class Type>
 Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
 (
@@ -55,18 +67,6 @@ Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
 {}
 
 
-template<class Type>
-Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchField<Type>(p, iF, dict)
-{}
-
-
 template<class Type>
 Foam::cellMotionFvPatchField<Type>::cellMotionFvPatchField
 (