cyclics: Removed unnecessary virtual inheritance of LduInterface classes

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H

@@ -51,7 +51,7 @@ namespace Foam
 class cyclicGAMGInterfaceField
 :
     public GAMGInterfaceField,
-    virtual public cyclicLduInterfaceField
+    public cyclicLduInterfaceField
 {
     // Private data
 

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H

@@ -50,7 +50,7 @@ namespace Foam
 class cyclicGAMGInterface
 :
     public GAMGInterface,
-    virtual public cyclicLduInterface
+    public cyclicLduInterface
 {
     // Private data
 

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,6 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     const porousBafflePressureFvPatchField& ptf
 )
 :
-    cyclicLduInterfaceField(),
     fixedJumpFvPatchField<scalar>(ptf),
     phiName_(ptf.phiName_),
     rhoName_(ptf.rhoName_),

src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,6 +78,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 )
 :
     coupledFvPatchField<Type>(ptf, p, iF, mapper),
+    cyclicLduInterfaceField(),
     cyclicPatch_(refCast<const cyclicFvPatch>(p))
 {
     if (!isA<cyclicFvPatch>(this->patch()))
@@ -98,8 +99,8 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
     const cyclicFvPatchField<Type>& ptf
 )
 :
-    cyclicLduInterfaceField(),
     coupledFvPatchField<Type>(ptf),
+    cyclicLduInterfaceField(),
     cyclicPatch_(ptf.cyclicPatch_)
 {}
 
@@ -112,6 +113,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
 )
 :
     coupledFvPatchField<Type>(ptf, iF),
+    cyclicLduInterfaceField(),
     cyclicPatch_(ptf.cyclicPatch_)
 {}
 

src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,8 +69,8 @@ namespace Foam
 template<class Type>
 class cyclicFvPatchField
 :
-    virtual public cyclicLduInterfaceField,
+    public coupledFvPatchField<Type>,
-    public coupledFvPatchField<Type>
+    public cyclicLduInterfaceField
 {
     // Private data
 

src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,8 +35,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    cyclicACMILduInterfaceField(),
     coupledFvPatchField<Type>(p, iF),
+    cyclicACMILduInterfaceField(),
     cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
 {}
 
@@ -49,8 +49,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     const dictionary& dict
 )
 :
-    cyclicACMILduInterfaceField(),
     coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
+    cyclicACMILduInterfaceField(),
     cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
 {
     if (!isA<cyclicACMIFvPatch>(p))
@@ -82,8 +82,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    cyclicACMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf, p, iF, mapper),
+    cyclicACMILduInterfaceField(),
     cyclicACMIPatch_(refCast<const cyclicACMIFvPatch>(p))
 {
     if (!isA<cyclicACMIFvPatch>(this->patch()))
@@ -105,8 +105,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     const cyclicACMIFvPatchField<Type>& ptf
 )
 :
-    cyclicACMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf),
+    cyclicACMILduInterfaceField(),
     cyclicACMIPatch_(ptf.cyclicACMIPatch_)
 {}
 
@@ -118,8 +118,8 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    cyclicACMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf, iF),
+    cyclicACMILduInterfaceField(),
     cyclicACMIPatch_(ptf.cyclicACMIPatch_)
 {}
 

src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,8 +68,8 @@ namespace Foam
 template<class Type>
 class cyclicACMIFvPatchField
 :
-    virtual public cyclicACMILduInterfaceField,
+    public coupledFvPatchField<Type>,
-    public coupledFvPatchField<Type>
+    public cyclicACMILduInterfaceField
 {
     // Private data
 

src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,8 +32,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    cyclicAMILduInterfaceField(),
     coupledFvPatchField<Type>(p, iF),
+    cyclicAMILduInterfaceField(),
     cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
 {}
 
@@ -46,8 +46,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     const dictionary& dict
 )
 :
-    cyclicAMILduInterfaceField(),
     coupledFvPatchField<Type>(p, iF, dict, dict.found("value")),
+    cyclicAMILduInterfaceField(),
     cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
 {
     if (!isA<cyclicAMIFvPatch>(p))
@@ -79,8 +79,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     const fvPatchFieldMapper& mapper
 )
 :
-    cyclicAMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf, p, iF, mapper),
+    cyclicAMILduInterfaceField(),
     cyclicAMIPatch_(refCast<const cyclicAMIFvPatch>(p))
 {
     if (!isA<cyclicAMIFvPatch>(this->patch()))
@@ -101,8 +101,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     const cyclicAMIFvPatchField<Type>& ptf
 )
 :
-    cyclicAMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf),
+    cyclicAMILduInterfaceField(),
     cyclicAMIPatch_(ptf.cyclicAMIPatch_)
 {}
 
@@ -114,8 +114,8 @@ Foam::cyclicAMIFvPatchField<Type>::cyclicAMIFvPatchField
     const DimensionedField<Type, volMesh>& iF
 )
 :
-    cyclicAMILduInterfaceField(),
     coupledFvPatchField<Type>(ptf, iF),
+    cyclicAMILduInterfaceField(),
     cyclicAMIPatch_(ptf.cyclicAMIPatch_)
 {}
 

src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -73,8 +73,8 @@ namespace Foam
 template<class Type>
 class cyclicAMIFvPatchField
 :
-    virtual public cyclicAMILduInterfaceField,
+    public coupledFvPatchField<Type>,
-    public coupledFvPatchField<Type>
+    public cyclicAMILduInterfaceField
 {
     // Private data
 

src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H

@@ -52,7 +52,7 @@ namespace Foam
 class cyclicACMIGAMGInterfaceField
 :
     public GAMGInterfaceField,
-    virtual public cyclicACMILduInterfaceField
+    public cyclicACMILduInterfaceField
 {
     // Private data
 

src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H

@@ -51,7 +51,7 @@ namespace Foam
 class cyclicAMIGAMGInterfaceField
 :
     public GAMGInterfaceField,
-    virtual public cyclicAMILduInterfaceField
+    public cyclicAMILduInterfaceField
 {
     // Private data
 

src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H

@@ -50,7 +50,7 @@ namespace Foam
 class cyclicACMIGAMGInterface
 :
     public GAMGInterface,
-    virtual public cyclicACMILduInterface
+    public cyclicACMILduInterface
 {
     // Private data
 

src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ namespace Foam
 class cyclicAMIGAMGInterface
 :
     public GAMGInterface,
-    virtual public cyclicAMILduInterface
+    public cyclicAMILduInterface
 {
     // Private data