Use factory Clone for patch fields

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H

@@ -110,15 +110,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new smoluchowskiJumpTFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         smoluchowskiJumpTFvPatchScalarField
         (
@@ -126,18 +117,22 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new smoluchowskiJumpTFvPatchScalarField(*this, iF)
-            );
         }
 
+
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.H

@@ -118,15 +118,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new maxwellSlipUFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         maxwellSlipUFvPatchVectorField
         (
@@ -134,16 +125,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new maxwellSlipUFvPatchVectorField(*this, iF)
-            );
         }
 
 

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H

@@ -135,15 +135,6 @@ public:
             const fixedRhoFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new fixedRhoFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedRhoFvPatchScalarField
         (
@@ -151,16 +142,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new fixedRhoFvPatchScalarField(*this, iF)
-            );
         }
 
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H

@@ -196,18 +196,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
         (
@@ -215,20 +203,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H

@@ -85,15 +85,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new adjointOutletPressureFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         adjointOutletPressureFvPatchScalarField
         (
@@ -101,16 +92,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new adjointOutletPressureFvPatchScalarField(*this, iF)
-            );
         }
 
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H

@@ -85,15 +85,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new adjointOutletVelocityFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         adjointOutletVelocityFvPatchVectorField
         (
@@ -101,16 +92,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new adjointOutletVelocityFvPatchVectorField(*this, iF)
-            );
         }
 
 

applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.H

@@ -164,15 +164,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new alphaContactAngleFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         alphaContactAngleFvPatchScalarField
         (
@@ -180,16 +171,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new alphaContactAngleFvPatchScalarField(*this, iF)
-            );
         }
 
 

applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H

@@ -164,15 +164,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new alphaContactAngleFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         alphaContactAngleFvPatchScalarField
         (
@@ -180,16 +171,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new alphaContactAngleFvPatchScalarField(*this, iF)
-            );
         }
 
 

applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.H

@@ -100,15 +100,6 @@ public:
             const tractionDisplacementFvPatchVectorField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new tractionDisplacementFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         tractionDisplacementFvPatchVectorField
         (
@@ -116,16 +107,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new tractionDisplacementFvPatchVectorField(*this, iF)
-            );
         }
 
 

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.H

@@ -98,15 +98,6 @@ public:
             const tractionDisplacementCorrectionFvPatchVectorField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new tractionDisplacementCorrectionFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         tractionDisplacementCorrectionFvPatchVectorField
         (
@@ -114,16 +105,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new tractionDisplacementCorrectionFvPatchVectorField(*this, iF)
-            );
         }
 
 

etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H

@@ -107,15 +107,6 @@ public:
             const ${typeName}FixedValueFvPatch${FieldType}&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatch${FieldType}> clone() const
-        {
-            return tmp<fvPatch${FieldType}>
-            (
-                new ${typeName}FixedValueFvPatch${FieldType}(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         ${typeName}FixedValueFvPatch${FieldType}
         (
@@ -123,16 +114,19 @@ public:
             const DimensionedField<${TemplateType}, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatch${FieldType}> clone
+        virtual tmp<fvPatchField<${TemplateType}>> clone() const
+        {
+            return fvPatchField<${TemplateType}>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<${TemplateType}>> clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp<fvPatch${FieldType}>
+            return fvPatchField<${TemplateType}>::Clone(*this, iF);
-            (
-                new ${typeName}FixedValueFvPatch${FieldType}(*this, iF)
-            );
         }
 
 

etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H

@@ -108,15 +108,6 @@ public:
             const ${typeName}FixedValuePointPatch${FieldType}&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<${TemplateType}>> clone() const
-        {
-            return autoPtr<pointPatchField<${TemplateType}>>
-            (
-                new ${typeName}FixedValuePointPatch${FieldType}(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         ${typeName}FixedValuePointPatch${FieldType}
         (
@@ -124,16 +115,19 @@ public:
             const DimensionedField<${TemplateType}, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<${TemplateType}>> clone() const
+        {
+            return pointPatchField<${TemplateType}>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<${TemplateType}>> clone
         (
             const DimensionedField<${TemplateType}, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<${TemplateType}>>
+            return pointPatchField<${TemplateType}>::Clone(*this, iF);
-            (
-                new ${typeName}FixedValuePointPatch${FieldType}(*this, iF)
-            );
         }
 
 

etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H

@@ -107,15 +107,6 @@ public:
             const ${typeName}MixedValueFvPatch${FieldType}&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatch${FieldType}> clone() const
-        {
-            return tmp<fvPatch${FieldType}>
-            (
-                new ${typeName}MixedValueFvPatch${FieldType}(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         ${typeName}MixedValueFvPatch${FieldType}
         (
@@ -123,16 +114,19 @@ public:
             const DimensionedField<${TemplateType}, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatch${FieldType}> clone
+        virtual tmp<fvPatchField<${TemplateType}>> clone() const
+        {
+            return fvPatchField<${TemplateType}>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<${TemplateType}>> clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp<fvPatch${FieldType}>
+            return fvPatchField<${TemplateType}>::Clone(*this, iF);
-            (
-                new ${typeName}MixedValueFvPatch${FieldType}(*this, iF)
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H

@@ -83,18 +83,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new basicSymmetryPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         basicSymmetryPointPatchField
         (
@@ -102,20 +90,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new basicSymmetryPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C

@@ -78,14 +78,13 @@ Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
 
 
 template<class Type>
-template<class Type2>
 Foam::autoPtr<Foam::pointPatchField<Type>>
 Foam::pointPatchField<Type>::NewCalculatedType
 (
-    const pointPatchField<Type2>& pf
+    const pointPatch& p
 )
 {
-    auto* patchTypeCtor = patchConstructorTable(pf.patch().type());
+    auto* patchTypeCtor = patchConstructorTable(p.type());
 
     if (patchTypeCtor)
     {
@@ -93,8 +92,8 @@ Foam::pointPatchField<Type>::NewCalculatedType
         (
             patchTypeCtor
             (
-                pf.patch(),
+                p,
-                Field<Type>::null()
+                DimensionedField<Type, pointMesh>::null()
             )
         );
     }
@@ -104,12 +103,24 @@ Foam::pointPatchField<Type>::NewCalculatedType
         (
             new calculatedPointPatchField<Type>
             (
-                pf.patch(),
+                p,
-                Field<Type>::null()
+                DimensionedField<Type, pointMesh>::null()
             )
         );
     }
 }
 
 
+template<class Type>
+template<class AnyType>
+Foam::autoPtr<Foam::pointPatchField<Type>>
+Foam::pointPatchField<Type>::NewCalculatedType
+(
+    const pointPatchField<AnyType>& pf
+)
+{
+    return NewCalculatedType(pf.patch());
+}
+
+
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H

@@ -85,18 +85,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new calculatedPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         calculatedPointPatchField
         (
@@ -104,18 +92,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual autoPtr<pointPatchField<Type>>
+        virtual autoPtr<pointPatchField<Type>> clone() const
-        clone(const DimensionedField<Type, pointMesh>& iF) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this);
-            (
+        }
-                new calculatedPointPatchField<Type>
+
-                (
+        //- Construct and return a clone setting internal field reference
-                    *this,
+        virtual autoPtr<pointPatchField<Type>> clone
-                    iF
+        (
-                )
+            const DimensionedField<Type, pointMesh>& iF
-            );
+        ) const
+        {
+            return pointPatchField<Type>::Clone(*this, iF);
         }
 };
 

src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H

@@ -87,9 +87,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
-
         //- Construct as copy setting internal field reference
         coupledPointPatchField
         (
@@ -97,6 +94,9 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const = 0;
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (

src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H

@@ -111,18 +111,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new fixedValuePointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedValuePointPatchField
         (
@@ -130,20 +118,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new fixedValuePointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H

@@ -142,18 +142,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new valuePointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         valuePointPatchField
         (
@@ -161,20 +149,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new valuePointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H

@@ -85,18 +85,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new zeroGradientPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         zeroGradientPointPatchField
         (
@@ -104,20 +92,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new zeroGradientPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 };
 

src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H

@@ -92,18 +92,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new cyclicPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         cyclicPointPatchField
         (
@@ -111,19 +99,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new cyclicPointPatchField<Type>
-                (
-                    *this, iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H

@@ -87,18 +87,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new cyclicSlipPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         cyclicSlipPointPatchField
         (
@@ -106,19 +94,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new cyclicSlipPointPatchField<Type>
-                (
-                    *this, iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H

@@ -86,18 +86,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new emptyPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         emptyPointPatchField
         (
@@ -105,22 +93,22 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new emptyPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
+
     // Member functions
 
         //- Constraint handling

src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H

@@ -87,18 +87,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new nonuniformTransformCyclicPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nonuniformTransformCyclicPointPatchField
         (
@@ -106,19 +94,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new nonuniformTransformCyclicPointPatchField<Type>
-                (
-                    *this, iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H

@@ -91,18 +91,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new processorPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         processorPointPatchField
         (
@@ -110,20 +98,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new processorPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H

@@ -99,18 +99,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new processorCyclicPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         processorCyclicPointPatchField
         (
@@ -118,20 +106,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new processorCyclicPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H

@@ -87,18 +87,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new symmetryPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         symmetryPointPatchField
         (
@@ -106,20 +94,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new symmetryPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H

@@ -92,18 +92,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new symmetryPlanePointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         symmetryPlanePointPatchField
         (
@@ -111,20 +99,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new symmetryPlanePointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H

@@ -87,18 +87,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new wedgePointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         wedgePointPatchField
         (
@@ -106,19 +94,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new wedgePointPatchField<Type>
-                (
-                    *this, iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H

@@ -209,15 +209,6 @@ public:
             const codedFixedValuePointPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new codedFixedValuePointPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         codedFixedValuePointPatchField
         (
@@ -225,20 +216,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new codedFixedValuePointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H

@@ -104,18 +104,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new fixedNormalSlipPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedNormalSlipPointPatchField
         (
@@ -123,22 +111,22 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new fixedNormalSlipPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
+
     // Member functions
 
         //- Update the patch field

src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H

@@ -86,18 +86,6 @@ public:
             const pointPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new slipPointPatchField<Type>
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         slipPointPatchField
         (
@@ -105,20 +93,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new slipPointPatchField<Type>
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 };
 

src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H

@@ -101,15 +101,6 @@ public:
             const timeVaryingUniformFixedValuePointPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<Type>> clone() const
-        {
-            return autoPtr<pointPatchField<Type>>
-            (
-                new timeVaryingUniformFixedValuePointPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         timeVaryingUniformFixedValuePointPatchField
         (
@@ -117,16 +108,19 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<Type>> clone() const
+        {
+            return pointPatchField<Type>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<Type>>
+            return pointPatchField<Type>::Clone(*this, iF);
-            (
-                new timeVaryingUniformFixedValuePointPatchField<Type>(*this, iF)
-            );
         }
 
 

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H

@@ -345,17 +345,31 @@ public:
             const DimensionedField<Type, pointMesh>&
         );
 
-        //- Construct and return a clone
+        //- Clone patch field with its own internal field reference
         virtual autoPtr<pointPatchField<Type>> clone() const = 0;
 
-        //- Construct and return a clone setting internal field reference
+        //- Clone patch field with an internal field reference
         virtual autoPtr<pointPatchField<Type>> clone
         (
             const DimensionedField<Type, pointMesh>& iF
         ) const = 0;
 
 
-    // Selectors
+    // Factory Methods
+
+        //- Clone a patch field, optionally with internal field reference etc.
+        template<class DerivedPatchField, class... Args>
+        static autoPtr<pointPatchField<Type>> Clone
+        (
+            const DerivedPatchField& pf,
+            Args&&... args
+        )
+        {
+            return autoPtr<pointPatchField<Type>>
+            (
+                new DerivedPatchField(pf, std::forward<Args>(args)...)
+            );
+        }
 
         //- Return a pointer to a new patchField created on freestore given
         //  patch and internal field
@@ -400,11 +414,19 @@ public:
 
         //- Return a pointer to a new calculatedPointPatchField created on
         //  freestore without setting patchField values
-        template<class Type2>
         static autoPtr<pointPatchField<Type>>
         NewCalculatedType
         (
-            const pointPatchField<Type2>&
+            const pointPatch& p
+        );
+
+        //- Return a pointer to a new calculatedPointPatchField created on
+        //  freestore without setting patchField values
+        template<class AnyType>
+        static autoPtr<pointPatchField<Type>>
+        NewCalculatedType
+        (
+            const pointPatchField<AnyType>& pf
         );
 
 

src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H

@@ -172,15 +172,6 @@ public:
             const alphatJayatillekeWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new alphatJayatillekeWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         alphatJayatillekeWallFunctionFvPatchScalarField
         (
@@ -188,16 +179,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new alphatJayatillekeWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H

@@ -167,18 +167,6 @@ public:
             const turbulentMixingLengthDissipationRateInletFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         turbulentMixingLengthDissipationRateInletFvPatchScalarField
         (
@@ -186,20 +174,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new turbulentMixingLengthDissipationRateInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H

@@ -144,18 +144,6 @@ public:
             const turbulentMixingLengthFrequencyInletFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         turbulentMixingLengthFrequencyInletFvPatchScalarField
         (
@@ -163,20 +151,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new turbulentMixingLengthFrequencyInletFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H

@@ -130,15 +130,6 @@ public:
             const fixedShearStressFvPatchVectorField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new fixedShearStressFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedShearStressFvPatchVectorField
         (
@@ -146,16 +137,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new fixedShearStressFvPatchVectorField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H

@@ -182,15 +182,6 @@ public:
             const porousBafflePressureFvPatchField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return tmp<fvPatchField<scalar>>
-            (
-                new porousBafflePressureFvPatchField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         porousBafflePressureFvPatchField
         (
@@ -198,16 +189,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<scalar>>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new porousBafflePressureFvPatchField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H

@@ -212,15 +212,6 @@ public:
             const epsilonWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         epsilonWallFunctionFvPatchScalarField
         (
@@ -228,16 +219,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new epsilonWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H

@@ -173,15 +173,6 @@ public:
             const kLowReWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         kLowReWallFunctionFvPatchScalarField
         (
@@ -189,16 +180,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new kLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H

@@ -123,15 +123,6 @@ public:
             const kqRWallFunctionFvPatchField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchField<Type>> clone() const
-        {
-            return tmp<fvPatchField<Type>>
-            (
-                new kqRWallFunctionFvPatchField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         kqRWallFunctionFvPatchField
         (
@@ -139,16 +130,19 @@ public:
             const DimensionedField<Type, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
+        virtual tmp<fvPatchField<Type>> clone() const
+        {
+            return fvPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type>>
+            return fvPatchField<Type>::Clone(*this, iF);
-            (
-                new kqRWallFunctionFvPatchField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H

@@ -129,15 +129,6 @@ public:
             const nutLowReWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutLowReWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutLowReWallFunctionFvPatchScalarField
         (
@@ -145,16 +136,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutLowReWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H

@@ -175,15 +175,6 @@ public:
             const nutUBlendedWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUBlendedWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutUBlendedWallFunctionFvPatchScalarField
         (
@@ -191,16 +182,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutUBlendedWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H

@@ -171,15 +171,6 @@ public:
             const nutURoughWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutURoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutURoughWallFunctionFvPatchScalarField
         (
@@ -187,16 +178,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutURoughWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H

@@ -189,15 +189,6 @@ public:
             const nutUSpaldingWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUSpaldingWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutUSpaldingWallFunctionFvPatchScalarField
         (
@@ -205,16 +196,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H

@@ -156,15 +156,6 @@ public:
             const nutUTabulatedWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUTabulatedWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutUTabulatedWallFunctionFvPatchScalarField
         (
@@ -172,16 +163,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutUTabulatedWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H

@@ -143,15 +143,6 @@ public:
             const nutUWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutUWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutUWallFunctionFvPatchScalarField
         (
@@ -159,16 +150,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutUWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H

@@ -153,15 +153,6 @@ public:
             const nutkRoughWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkRoughWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutkRoughWallFunctionFvPatchScalarField
         (
@@ -169,16 +160,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutkRoughWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H

@@ -134,15 +134,6 @@ public:
             const nutkWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new nutkWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         nutkWallFunctionFvPatchScalarField
         (
@@ -150,16 +141,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new nutkWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H

@@ -203,15 +203,6 @@ public:
             const omegaWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new omegaWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         omegaWallFunctionFvPatchScalarField
         (
@@ -219,18 +210,22 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new omegaWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
+
     //- Destructor
     virtual ~omegaWallFunctionFvPatchScalarField() = default;
 

src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H

@@ -149,15 +149,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmBoundaryLayerInletEpsilonFvPatchScalarField
         (
@@ -165,16 +156,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmBoundaryLayerInletEpsilonFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletK/atmBoundaryLayerInletKFvPatchScalarField.H

@@ -148,15 +148,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmBoundaryLayerInletKFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmBoundaryLayerInletKFvPatchScalarField
         (
@@ -164,16 +155,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmBoundaryLayerInletKFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletOmega/atmBoundaryLayerInletOmegaFvPatchScalarField.H

@@ -145,15 +145,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmBoundaryLayerInletOmegaFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmBoundaryLayerInletOmegaFvPatchScalarField
         (
@@ -161,16 +152,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmBoundaryLayerInletOmegaFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H

@@ -152,15 +152,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new atmBoundaryLayerInletVelocityFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmBoundaryLayerInletVelocityFvPatchVectorField
         (
@@ -168,16 +159,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new atmBoundaryLayerInletVelocityFvPatchVectorField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.H

@@ -177,15 +177,6 @@ public:
             const atmTurbulentHeatFluxTemperatureFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmTurbulentHeatFluxTemperatureFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmTurbulentHeatFluxTemperatureFvPatchScalarField
         (
@@ -193,20 +184,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmTurbulentHeatFluxTemperatureFvPatchScalarField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.H

@@ -179,15 +179,6 @@ public:
             const atmAlphatkWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmAlphatkWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmAlphatkWallFunctionFvPatchScalarField
         (
@@ -195,16 +186,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmAlphatkWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.H

@@ -170,15 +170,6 @@ public:
             const atmEpsilonWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmEpsilonWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmEpsilonWallFunctionFvPatchScalarField
         (
@@ -186,18 +177,22 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmEpsilonWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
+
     //- Destructor
     virtual ~atmEpsilonWallFunctionFvPatchScalarField() = default;
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutUWallFunction/atmNutUWallFunctionFvPatchScalarField.H

@@ -170,15 +170,6 @@ public:
             const atmNutUWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmNutUWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmNutUWallFunctionFvPatchScalarField
         (
@@ -186,16 +177,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmNutUWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutWallFunction/atmNutWallFunctionFvPatchScalarField.H

@@ -207,15 +207,6 @@ public:
             const atmNutWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmNutWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmNutWallFunctionFvPatchScalarField
         (
@@ -223,16 +214,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmNutWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmNutkWallFunction/atmNutkWallFunctionFvPatchScalarField.H

@@ -191,15 +191,6 @@ public:
             const atmNutkWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmNutkWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmNutkWallFunctionFvPatchScalarField
         (
@@ -207,16 +198,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmNutkWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.H

@@ -169,15 +169,6 @@ public:
             const atmOmegaWallFunctionFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField>
-            (
-                new atmOmegaWallFunctionFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         atmOmegaWallFunctionFvPatchScalarField
         (
@@ -185,16 +176,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new atmOmegaWallFunctionFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H

@@ -132,15 +132,6 @@ public:
             const freeSurfacePressureFvPatchScalarField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchScalarField> clone() const
-        {
-            return tmp<fvPatchScalarField >
-            (
-                new freeSurfacePressureFvPatchScalarField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         freeSurfacePressureFvPatchScalarField
         (
@@ -148,16 +139,19 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchScalarField> clone
+        virtual tmp<fvPatchField<scalar>> clone() const
+        {
+            return fvPatchField<scalar>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<scalar>> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchScalarField>
+            return fvPatchField<scalar>::Clone(*this, iF);
-            (
-                new freeSurfacePressureFvPatchScalarField(*this, iF)
-            );
         }
 
 

src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfaceVelocity/freeSurfaceVelocityFvPatchVectorField.H

@@ -90,15 +90,6 @@ public:
             const fvPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<fvPatchVectorField> clone() const
-        {
-            return tmp<fvPatchVectorField>
-            (
-                new freeSurfaceVelocityFvPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         freeSurfaceVelocityFvPatchVectorField
         (
@@ -106,16 +97,19 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return a clone
-        virtual tmp<fvPatchVectorField> clone
+        virtual tmp<fvPatchField<vector>> clone() const
+        {
+            return fvPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<fvPatchField<vector>> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchVectorField>
+            return fvPatchField<vector>::Clone(*this, iF);
-            (
-                new freeSurfaceVelocityFvPatchVectorField(*this, iF)
-            );
         }
 
 

src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H

@@ -101,18 +101,6 @@ public:
             const solidBodyMotionDisplacementPointPatchVectorField&
         );
 
-        //- Construct and return a clone
-        virtual autoPtr<pointPatchField<vector>> clone() const
-        {
-            return autoPtr<pointPatchField<vector>>
-            (
-                new solidBodyMotionDisplacementPointPatchVectorField
-                (
-                    *this
-                )
-            );
-        }
-
         //- Construct as copy setting internal field reference
         solidBodyMotionDisplacementPointPatchVectorField
         (
@@ -121,20 +109,19 @@ public:
         );
 
 
+        //- Return a clone
+        virtual autoPtr<pointPatchField<vector>> clone() const
+        {
+            return pointPatchField<vector>::Clone(*this);
+        }
+
         //- Construct and return a clone setting internal field reference
         virtual autoPtr<pointPatchField<vector>> clone
         (
             const DimensionedField<vector, pointMesh>& iF
         ) const
         {
-            return autoPtr<pointPatchField<vector>>
+            return pointPatchField<vector>::Clone(*this, iF);
-            (
-                new solidBodyMotionDisplacementPointPatchVectorField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H

@@ -95,15 +95,6 @@ public:
             const basicSymmetryFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new basicSymmetryFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         basicSymmetryFaPatchField
         (
@@ -111,16 +102,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new basicSymmetryFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.C

@@ -90,19 +90,19 @@ Foam::calculatedFaPatchField<Type>::calculatedFaPatchField
 
 
 template<class Type>
-template<class AnyType>
+Foam::tmp<Foam::faPatchField<Type>>
-Foam::tmp<Foam::faPatchField<Type>> Foam::faPatchField<Type>::NewCalculatedType
+Foam::faPatchField<Type>::NewCalculatedType
 (
-    const faPatchField<AnyType>& pf
+    const faPatch& p
 )
 {
-    auto* patchTypeCtor = patchConstructorTable(pf.patch().type());
+    auto* patchTypeCtor = patchConstructorTable(p.type());
 
     if (patchTypeCtor)
     {
         return patchTypeCtor
         (
-            pf.patch(),
+            p,
             DimensionedField<Type, areaMesh>::null()
         );
     }
@@ -112,7 +112,7 @@ Foam::tmp<Foam::faPatchField<Type>> Foam::faPatchField<Type>::NewCalculatedType
         (
             new calculatedFaPatchField<Type>
             (
-                pf.patch(),
+                p,
                 DimensionedField<Type, areaMesh>::null()
             )
         );
@@ -120,6 +120,18 @@ Foam::tmp<Foam::faPatchField<Type>> Foam::faPatchField<Type>::NewCalculatedType
 }
 
 
+template<class Type>
+template<class AnyType>
+Foam::tmp<Foam::faPatchField<Type>>
+Foam::faPatchField<Type>::NewCalculatedType
+(
+    const faPatchField<AnyType>& pf
+)
+{
+    return NewCalculatedType(pf.patch());
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/finiteArea/fields/faPatchFields/basic/calculated/calculatedFaPatchField.H

@@ -97,15 +97,6 @@ public:
             const calculatedFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new calculatedFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         calculatedFaPatchField
         (
@@ -113,16 +104,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new calculatedFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H

@@ -108,9 +108,6 @@ public:
             const coupledFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const = 0;
-
         //- Construct as copy setting internal field reference
         coupledFaPatchField
         (
@@ -118,6 +115,9 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const = 0;
+
         //- Construct and return a clone
         virtual tmp<faPatchField<Type>> clone
         (

src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H

@@ -108,15 +108,6 @@ public:
             const extrapolatedCalculatedFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new extrapolatedCalculatedFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         extrapolatedCalculatedFaPatchField
         (
@@ -124,16 +115,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new extrapolatedCalculatedFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H

@@ -144,15 +144,6 @@ public:
             const fixedGradientFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new fixedGradientFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedGradientFaPatchField
         (
@@ -160,16 +151,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new fixedGradientFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/fixedValue/fixedValueFaPatchField.H

@@ -106,15 +106,6 @@ public:
             const fixedValueFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new fixedValueFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedValueFaPatchField
         (
@@ -122,16 +113,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new fixedValueFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H

@@ -144,15 +144,6 @@ public:
             const mixedFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new mixedFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         mixedFaPatchField
         (
@@ -160,16 +151,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new mixedFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.C

@@ -111,47 +111,14 @@ Foam::slicedFaPatchField<Type>::slicedFaPatchField
 }
 
 
-template<class Type>
-Foam::tmp<Foam::faPatchField<Type>>
-Foam::slicedFaPatchField<Type>::clone() const
-{
-    return tmp<faPatchField<Type>>
-    (
-        new slicedFaPatchField<Type>(*this)
-    );
-}
-
-
 template<class Type>
 Foam::slicedFaPatchField<Type>::slicedFaPatchField
 (
     const slicedFaPatchField<Type>& ptf
 )
 :
-    faPatchField<Type>
+    slicedFaPatchField<Type>(ptf, ptf.internalField())
-    (
+{}
-        ptf.patch(),
-        ptf.internalField(),
-        Field<Type>()
-    )
-{
-    // Transfer the slice from the argument
-    UList<Type>::shallowCopy(ptf);
-}
-
-
-template<class Type>
-Foam::tmp<Foam::faPatchField<Type>>
-Foam::slicedFaPatchField<Type>::clone
-(
-    const DimensionedField<Type, areaMesh>& iF
-) const
-{
-    return tmp<faPatchField<Type>>
-    (
-        new slicedFaPatchField<Type>(*this, iF)
-    );
-}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -170,8 +137,7 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::slicedFaPatchField<Type>::snGrad() const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -180,8 +146,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::slicedFaPatchField<Type>::patchInternalField() const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -200,8 +165,7 @@ Foam::slicedFaPatchField<Type>::patchNeighbourField
 ) const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -210,8 +174,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::slicedFaPatchField<Type>::patchNeighbourField() const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -223,8 +186,7 @@ Foam::slicedFaPatchField<Type>::valueInternalCoeffs
 ) const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -236,8 +198,7 @@ Foam::slicedFaPatchField<Type>::valueBoundaryCoeffs
 ) const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -246,8 +207,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::slicedFaPatchField<Type>::gradientInternalCoeffs() const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 
@@ -256,8 +216,7 @@ Foam::tmp<Foam::Field<Type>>
 Foam::slicedFaPatchField<Type>::gradientBoundaryCoeffs() const
 {
     NotImplemented;
-
+    return nullptr;
-    return Field<Type>::null();
 }
 
 

src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H

@@ -116,9 +116,6 @@ public:
         //- Construct as copy
         slicedFaPatchField(const slicedFaPatchField<Type>&);
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const;
-
         //- Construct as copy setting internal field reference
         slicedFaPatchField
         (
@@ -126,11 +123,20 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
-        ) const;
+        ) const
+        {
+            return faPatchField<Type>::Clone(*this, iF);
+        }
 
 
     //- Destructor

src/finiteArea/fields/faPatchFields/basic/transform/transformFaPatchField.H

@@ -92,9 +92,6 @@ public:
             const faPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const = 0;
-
         //- Construct as copy setting internal field reference
         transformFaPatchField
         (
@@ -102,6 +99,9 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const = 0;
+
         //- Construct and return a clone setting internal field reference
         virtual tmp<faPatchField<Type>> clone
         (

src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H

@@ -96,15 +96,6 @@ public:
             const zeroGradientFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new zeroGradientFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         zeroGradientFaPatchField
         (
@@ -112,16 +103,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new zeroGradientFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.H

@@ -118,15 +118,6 @@ public:
             const cyclicFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new cyclicFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         cyclicFaPatchField
         (
@@ -134,16 +125,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new cyclicFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/constraint/empty/emptyFaPatchField.H

@@ -97,15 +97,6 @@ public:
             const emptyFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new emptyFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         emptyFaPatchField
         (
@@ -113,16 +104,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new emptyFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H

@@ -137,15 +137,6 @@ public:
         //- Construct as copy
         processorFaPatchField(const processorFaPatchField<Type>&);
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new processorFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         processorFaPatchField
         (
@@ -153,16 +144,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new processorFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/constraint/symmetry/symmetryFaPatchField.H

@@ -97,15 +97,6 @@ public:
             const symmetryFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new symmetryFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         symmetryFaPatchField
         (
@@ -113,16 +104,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new symmetryFaPatchField<Type>(*this, iF)
-            );
         }
 };
 

src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H

@@ -91,15 +91,6 @@ public:
             const faPatchFieldMapper&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new wedgeFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         wedgeFaPatchField
         (
@@ -107,16 +98,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new wedgeFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H

@@ -115,15 +115,6 @@ public:
             const clampedPlateFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new clampedPlateFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         clampedPlateFaPatchField
         (
@@ -131,16 +122,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new clampedPlateFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.H

@@ -113,15 +113,6 @@ public:
             const edgeNormalFixedValueFaPatchVectorField&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchVectorField> clone() const
-        {
-            return tmp<faPatchVectorField>
-            (
-                new edgeNormalFixedValueFaPatchVectorField(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         edgeNormalFixedValueFaPatchVectorField
         (
@@ -129,24 +120,22 @@ public:
             const DimensionedField<vector, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
-        virtual tmp<faPatchVectorField> clone
+        virtual tmp<faPatchField<vector>> clone() const
+        {
+            return faPatchField<vector>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
+        virtual tmp<faPatchField<vector>> clone
         (
             const DimensionedField<vector, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchVectorField>
+            return faPatchField<vector>::Clone(*this, iF);
-            (
-                new edgeNormalFixedValueFaPatchVectorField
-                (
-                    *this,
-                    iF
-                )
-            );
         }
 
 
-
     // Member functions
 
         // Mapping functions

src/finiteArea/fields/faPatchFields/derived/fixedValueOutflow/fixedValueOutflowFaPatchField.H

@@ -96,15 +96,6 @@ public:
             const fixedValueOutflowFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new fixedValueOutflowFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedValueOutflowFaPatchField
         (
@@ -112,16 +103,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new fixedValueOutflowFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/ignore/ignoreFaPatchField.H

@@ -114,15 +114,6 @@ public:
             const ignoreFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new ignoreFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         ignoreFaPatchField
         (
@@ -130,16 +121,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new ignoreFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/inletOutlet/inletOutletFaPatchField.H

@@ -136,15 +136,6 @@ public:
             const inletOutletFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new inletOutletFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         inletOutletFaPatchField
         (
@@ -152,16 +143,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new inletOutletFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/outletInlet/outletInletFaPatchField.H

@@ -135,15 +135,6 @@ public:
             const outletInletFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new outletInletFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         outletInletFaPatchField
         (
@@ -151,16 +142,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new outletInletFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/slip/slipFaPatchField.H

@@ -97,15 +97,6 @@ public:
             const slipFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new slipFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         slipFaPatchField
         (
@@ -113,16 +104,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new slipFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchField.H

@@ -137,15 +137,6 @@ public:
             const timeVaryingUniformFixedValueFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new timeVaryingUniformFixedValueFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         timeVaryingUniformFixedValueFaPatchField
         (
@@ -153,16 +144,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new timeVaryingUniformFixedValueFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/uniformFixedGradient/uniformFixedGradientFaPatchField.H

@@ -138,15 +138,6 @@ public:
             const uniformFixedGradientFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new uniformFixedGradientFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         uniformFixedGradientFaPatchField
         (
@@ -154,16 +145,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new uniformFixedGradientFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/uniformFixedValue/uniformFixedValueFaPatchField.H

@@ -139,15 +139,6 @@ public:
             const uniformFixedValueFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new uniformFixedValueFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         uniformFixedValueFaPatchField
         (
@@ -155,16 +146,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new uniformFixedValueFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/derived/uniformMixed/uniformMixedFaPatchField.H

@@ -160,15 +160,6 @@ public:
             const uniformMixedFaPatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faPatchField<Type>> clone() const
-        {
-            return tmp<faPatchField<Type>>
-            (
-                new uniformMixedFaPatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         uniformMixedFaPatchField
         (
@@ -176,16 +167,19 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faPatchField<Type>> clone() const
+        {
+            return faPatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>
+            return faPatchField<Type>::Clone(*this, iF);
-            (
-                new uniformMixedFaPatchField<Type>(*this, iF)
-            );
         }
 
 

src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H

@@ -393,23 +393,56 @@ public:
             const DimensionedField<Type, areaMesh>&
         );
 
-        //- Construct and return a clone
+        //- Clone patch field with its own internal field reference
         virtual tmp<faPatchField<Type>> clone() const
         {
-            return tmp<faPatchField<Type>>(new faPatchField<Type>(*this));
+            return tmp<faPatchField<Type>>
+            (
+                new faPatchField<Type>(*this, this->internalField_)
+            );
         }
 
-        //- Construct and return a clone setting internal field reference
+        //- Clone with an internal field reference
         virtual tmp<faPatchField<Type>> clone
         (
             const DimensionedField<Type, areaMesh>& iF
         ) const
         {
-            return tmp<faPatchField<Type>>(new faPatchField<Type>(*this, iF));
+            return tmp<faPatchField<Type>>
+            (
+                new faPatchField<Type>(*this, iF)
+            );
         }
 
 
-    // Selectors
+    // Factory Methods
+
+        //- Clone a patch field with its own internal field reference
+        template<class DerivedPatchField>
+        static tmp<faPatchField<Type>> Clone
+        (
+            const DerivedPatchField& pf
+        )
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new DerivedPatchField(pf)
+            );
+        }
+
+        //- Clone a patch field with an internal field reference
+        template<class DerivedPatchField>
+        static tmp<faPatchField<Type>> Clone
+        (
+            const DerivedPatchField& pf,
+            const DimensionedField<Type, areaMesh>& iF
+        )
+        {
+            return tmp<faPatchField<Type>>
+            (
+                new DerivedPatchField(pf, iF)
+            );
+        }
 
         //- Return a pointer to a new patchField created on freestore given
         //- patch and internal field
@@ -451,6 +484,13 @@ public:
             const dictionary&
         );
 
+        //- Return a pointer to a new calculatedFaPatchField created on
+        //- freestore without setting patchField values
+        static tmp<faPatchField<Type>> NewCalculatedType
+        (
+            const faPatch& p
+        );
+
         //- Return a pointer to a new calculatedFaPatchField created on
         //- freestore without setting patchField values
         template<class AnyType>

src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.C

@@ -90,20 +90,19 @@ Foam::calculatedFaePatchField<Type>::calculatedFaePatchField
 
 
 template<class Type>
-template<class Type2>
 Foam::tmp<Foam::faePatchField<Type>>
 Foam::faePatchField<Type>::NewCalculatedType
 (
-    const faePatchField<Type2>& pf
+    const faPatch& p
 )
 {
-    auto* patchTypeCtor = patchConstructorTable(pf.patch().type());
+    auto* patchTypeCtor = patchConstructorTable(p.type());
 
     if (patchTypeCtor)
     {
         return patchTypeCtor
         (
-            pf.patch(),
+            p,
             DimensionedField<Type, edgeMesh>::null()
         );
     }
@@ -113,7 +112,7 @@ Foam::faePatchField<Type>::NewCalculatedType
         (
             new calculatedFaePatchField<Type>
             (
-                pf.patch(),
+                p,
                 DimensionedField<Type, edgeMesh>::null()
             )
         );
@@ -121,6 +120,18 @@ Foam::faePatchField<Type>::NewCalculatedType
 }
 
 
+template<class Type>
+template<class AnyType>
+Foam::tmp<Foam::faePatchField<Type>>
+Foam::faePatchField<Type>::NewCalculatedType
+(
+    const faePatchField<AnyType>& pf
+)
+{
+    return NewCalculatedType(pf.patch());
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchField.H

@@ -94,15 +94,6 @@ public:
         //- Construct as copy
         calculatedFaePatchField(const calculatedFaePatchField<Type>&);
 
-        //- Construct and return a clone
-        virtual tmp<faePatchField<Type>> clone() const
-        {
-            return tmp<faePatchField<Type>>
-            (
-                new calculatedFaePatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         calculatedFaePatchField
         (
@@ -110,18 +101,22 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faePatchField<Type>> clone() const
+        {
+            return faePatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faePatchField<Type>> clone
         (
             const DimensionedField<Type, edgeMesh>& iF
         ) const
         {
-            return tmp<faePatchField<Type>>
+            return faePatchField<Type>::Clone(*this, iF);
-            (
-                new calculatedFaePatchField<Type>(*this, iF)
-            );
         }
 
+
     //- Destructor
     virtual ~calculatedFaePatchField() = default;
 

src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchField.H

@@ -106,9 +106,6 @@ public:
             const coupledFaePatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faePatchField<Type>> clone() const = 0;
-
         //- Construct as copy setting internal field reference
         coupledFaePatchField
         (
@@ -116,6 +113,9 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
+        //- Return clone
+        virtual tmp<faePatchField<Type>> clone() const = 0;
+
         //- Construct and return a clone
         virtual tmp<faePatchField<Type>> clone
         (

src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchField.H

@@ -106,15 +106,6 @@ public:
             const fixedValueFaePatchField<Type>&
         );
 
-        //- Construct and return a clone
-        virtual tmp<faePatchField<Type>> clone() const
-        {
-            return tmp<faePatchField<Type>>
-            (
-                new fixedValueFaePatchField<Type>(*this)
-            );
-        }
-
         //- Construct as copy setting internal field reference
         fixedValueFaePatchField
         (
@@ -122,18 +113,22 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faePatchField<Type>> clone() const
+        {
+            return faePatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faePatchField<Type>> clone
         (
             const DimensionedField<Type, edgeMesh>& iF
         ) const
         {
-            return tmp<faePatchField<Type>>
+            return faePatchField<Type>::Clone(*this, iF);
-            (
-                new fixedValueFaePatchField<Type>(*this, iF)
-            );
         }
 
+
     //- Destructor
     virtual ~fixedValueFaePatchField() = default;
 

src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.C

@@ -111,47 +111,14 @@ Foam::slicedFaePatchField<Type>::slicedFaePatchField
 }
 
 
-template<class Type>
-Foam::tmp<Foam::faePatchField<Type>>
-Foam::slicedFaePatchField<Type>::clone() const
-{
-    return tmp<faePatchField<Type>>
-    (
-        new slicedFaePatchField<Type>(*this)
-    );
-}
-
-
 template<class Type>
 Foam::slicedFaePatchField<Type>::slicedFaePatchField
 (
     const slicedFaePatchField<Type>& ptf
 )
 :
-    faePatchField<Type>
+    slicedFaePatchField<Type>(ptf, ptf.internalField())
-    (
+{}
-        ptf.patch(),
-        ptf.internalField(),
-        Field<Type>()
-    )
-{
-    // Transfer the slice from the argument
-    UList<Type>::shallowCopy(ptf);
-}
-
-
-template<class Type>
-Foam::tmp<Foam::faePatchField<Type>>
-Foam::slicedFaePatchField<Type>::clone
-(
-    const DimensionedField<Type, edgeMesh>& iF
-) const
-{
-    return tmp<faePatchField<Type>>
-    (
-        new slicedFaePatchField<Type>(*this, iF)
-    );
-}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //

src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchField.H

@@ -109,9 +109,6 @@ public:
         //- Construct as copy
         slicedFaePatchField(const slicedFaePatchField<Type>&);
 
-        //- Construct and return a clone
-        virtual tmp<faePatchField<Type>> clone() const;
-
         //- Construct as copy setting internal field reference
         slicedFaePatchField
         (
@@ -119,11 +116,20 @@ public:
             const DimensionedField<Type, edgeMesh>&
         );
 
-        //- Construct and return a clone setting internal field reference
+        //- Return clone
+        virtual tmp<faePatchField<Type>> clone() const
+        {
+            return faePatchField<Type>::Clone(*this);
+        }
+
+        //- Clone with an internal field reference
         virtual tmp<faePatchField<Type>> clone
         (
             const DimensionedField<Type, edgeMesh>& iF
-        ) const;
+        ) const
+        {
+            return faePatchField<Type>::Clone(*this, iF);
+        }
 
 
     //- Destructor