diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H index 9f6cbba19..07d819cb9 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H +++ b/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 diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H index 9773925b0..fecc7cf7c 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H +++ b/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 diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index d2fae8965..38c8e95d8 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/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(ptf), phiName_(ptf.phiName_), rhoName_(ptf.rhoName_), diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index db36178e7..a8f7b9900 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/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::cyclicFvPatchField ) : coupledFvPatchField(ptf, p, iF, mapper), + cyclicLduInterfaceField(), cyclicPatch_(refCast(p)) { if (!isA(this->patch())) @@ -98,8 +99,8 @@ Foam::cyclicFvPatchField::cyclicFvPatchField const cyclicFvPatchField& ptf ) : - cyclicLduInterfaceField(), coupledFvPatchField(ptf), + cyclicLduInterfaceField(), cyclicPatch_(ptf.cyclicPatch_) {} @@ -112,6 +113,7 @@ Foam::cyclicFvPatchField::cyclicFvPatchField ) : coupledFvPatchField(ptf, iF), + cyclicLduInterfaceField(), cyclicPatch_(ptf.cyclicPatch_) {} diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H index 8122c2113..15ce65da2 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.H +++ b/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 cyclicFvPatchField : - virtual public cyclicLduInterfaceField, - public coupledFvPatchField + public coupledFvPatchField, + public cyclicLduInterfaceField { // Private data diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C index 124c42fb8..79982c9c0 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C +++ b/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::cyclicACMIFvPatchField const DimensionedField& iF ) : - cyclicACMILduInterfaceField(), coupledFvPatchField(p, iF), + cyclicACMILduInterfaceField(), cyclicACMIPatch_(refCast(p)) {} @@ -49,8 +49,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField const dictionary& dict ) : - cyclicACMILduInterfaceField(), coupledFvPatchField(p, iF, dict, dict.found("value")), + cyclicACMILduInterfaceField(), cyclicACMIPatch_(refCast(p)) { if (!isA(p)) @@ -82,8 +82,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField const fvPatchFieldMapper& mapper ) : - cyclicACMILduInterfaceField(), coupledFvPatchField(ptf, p, iF, mapper), + cyclicACMILduInterfaceField(), cyclicACMIPatch_(refCast(p)) { if (!isA(this->patch())) @@ -105,8 +105,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField const cyclicACMIFvPatchField& ptf ) : - cyclicACMILduInterfaceField(), coupledFvPatchField(ptf), + cyclicACMILduInterfaceField(), cyclicACMIPatch_(ptf.cyclicACMIPatch_) {} @@ -118,8 +118,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField const DimensionedField& iF ) : - cyclicACMILduInterfaceField(), coupledFvPatchField(ptf, iF), + cyclicACMILduInterfaceField(), cyclicACMIPatch_(ptf.cyclicACMIPatch_) {} diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H index ebb2fb8cb..7f7921dd9 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.H +++ b/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 cyclicACMIFvPatchField : - virtual public cyclicACMILduInterfaceField, - public coupledFvPatchField + public coupledFvPatchField, + public cyclicACMILduInterfaceField { // Private data diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index 50f0b5593..f55a1b3af 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/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::cyclicAMIFvPatchField const DimensionedField& iF ) : - cyclicAMILduInterfaceField(), coupledFvPatchField(p, iF), + cyclicAMILduInterfaceField(), cyclicAMIPatch_(refCast(p)) {} @@ -46,8 +46,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField const dictionary& dict ) : - cyclicAMILduInterfaceField(), coupledFvPatchField(p, iF, dict, dict.found("value")), + cyclicAMILduInterfaceField(), cyclicAMIPatch_(refCast(p)) { if (!isA(p)) @@ -79,8 +79,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField const fvPatchFieldMapper& mapper ) : - cyclicAMILduInterfaceField(), coupledFvPatchField(ptf, p, iF, mapper), + cyclicAMILduInterfaceField(), cyclicAMIPatch_(refCast(p)) { if (!isA(this->patch())) @@ -101,8 +101,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField const cyclicAMIFvPatchField& ptf ) : - cyclicAMILduInterfaceField(), coupledFvPatchField(ptf), + cyclicAMILduInterfaceField(), cyclicAMIPatch_(ptf.cyclicAMIPatch_) {} @@ -114,8 +114,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField const DimensionedField& iF ) : - cyclicAMILduInterfaceField(), coupledFvPatchField(ptf, iF), + cyclicAMILduInterfaceField(), cyclicAMIPatch_(ptf.cyclicAMIPatch_) {} diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H index 7ad7bddbb..19606b1fb 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.H +++ b/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 cyclicAMIFvPatchField : - virtual public cyclicAMILduInterfaceField, - public coupledFvPatchField + public coupledFvPatchField, + public cyclicAMILduInterfaceField { // Private data diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H index 042a816a2..fb6602103 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.H +++ b/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 diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H index 1fd475099..a933d00d0 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.H +++ b/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 diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H index bf471d830..200ddc739 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.H +++ b/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 diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H index 6cc7600ca..2f085acd4 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.H +++ b/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