From 0ae3da8560d338df38ef699be264016bcdab453b Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Wed, 24 Jan 2024 19:18:17 +0100 Subject: [PATCH] COMP: using incomplete class edgeMesh --- .../basic/calculated/calculatedFaePatchFields.C | 15 +++++---------- .../basic/coupled/coupledFaePatchFields.C | 9 ++++----- .../basic/fixedValue/fixedValueFaePatchFields.C | 15 +++++---------- .../basic/sliced/slicedFaePatchFields.C | 3 ++- .../constraint/cyclic/cyclicFaePatchFields.C | 13 ++++--------- .../constraint/empty/emptyFaePatchFields.C | 15 +++++---------- .../processor/processorFaePatchFields.C | 13 ++++--------- .../constraint/symmetry/symmetryFaePatchFields.C | 13 ++++--------- .../constraint/wedge/wedgeFaePatchFields.C | 13 ++++--------- .../genericFaePatchField/genericFaePatchFields.C | 3 ++- 10 files changed, 39 insertions(+), 73 deletions(-) diff --git a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C index f30f4c2c7a3..db80c8089e6 100644 --- a/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/basic/calculated/calculatedFaePatchFields.C @@ -25,21 +25,16 @@ License \*---------------------------------------------------------------------------*/ -#include "faePatchFields.H" #include "calculatedFaePatchFields.H" +#include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(calculated); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(calculated); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C index 336c5e3910c..e4f608e77b7 100644 --- a/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/basic/coupled/coupledFaePatchFields.C @@ -25,17 +25,16 @@ License \*---------------------------------------------------------------------------*/ -#include "faePatchFields.H" #include "coupledFaePatchFields.H" +#include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -makeFaePatchFieldsTypeName(coupled); - -} // End namespace Foam + makeFaePatchFieldsTypeName(coupled); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.C index 25de776cde0..9a314ad5b8f 100644 --- a/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/basic/fixedValue/fixedValueFaePatchFields.C @@ -25,21 +25,16 @@ License \*---------------------------------------------------------------------------*/ -#include "faePatchFields.H" #include "fixedValueFaePatchFields.H" +#include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(fixedValue); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(fixedValue); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C index d576a082d32..ed8e890046c 100644 --- a/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/basic/sliced/slicedFaePatchFields.C @@ -26,8 +26,9 @@ License \*---------------------------------------------------------------------------*/ #include "slicedFaePatchFields.H" -#include "addToRunTimeSelectionTable.H" #include "faePatchFields.H" +#include "edgeFaMesh.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.C index cc8e3a7dbf4..731f9e7fa2d 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/constraint/cyclic/cyclicFaePatchFields.C @@ -27,19 +27,14 @@ License #include "cyclicFaePatchFields.H" #include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(cyclic); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(cyclic); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.C index a07507722d4..b2085e0bd4b 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/constraint/empty/emptyFaePatchFields.C @@ -25,21 +25,16 @@ License \*---------------------------------------------------------------------------*/ -#include "faePatchFields.H" #include "emptyFaePatchFields.H" +#include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(empty); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(empty); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C index 60e6ac337e7..d50cb717b5e 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/constraint/processor/processorFaePatchFields.C @@ -27,19 +27,14 @@ License #include "processorFaePatchFields.H" #include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(processor); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(processor); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.C index b45e2b67eed..922cf96c727 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/constraint/symmetry/symmetryFaePatchFields.C @@ -27,19 +27,14 @@ License #include "symmetryFaePatchFields.H" #include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeFaePatchFields(symmetry); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(symmetry); +} // ************************************************************************* // diff --git a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.C b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.C index 7dec3700b1c..db9869f5360 100644 --- a/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.C +++ b/src/finiteArea/fields/faePatchFields/constraint/wedge/wedgeFaePatchFields.C @@ -27,19 +27,14 @@ License #include "wedgeFaePatchFields.H" #include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Member * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Member * * * * * * * * * * * * * // - -makeFaePatchFields(wedge); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam + makeFaePatchFields(wedge); +} // ************************************************************************* // diff --git a/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C index 66f5fbc9b13..6948e084026 100644 --- a/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C +++ b/src/genericPatchFields/genericFaePatchField/genericFaePatchFields.C @@ -26,8 +26,9 @@ License \*---------------------------------------------------------------------------*/ #include "genericFaePatchFields.H" +#include "faePatchFields.H" +#include "edgeFaMesh.H" #include "addToRunTimeSelectionTable.H" -#include "edgeFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -- GitLab