diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 9d185094182499bdf3d7832f47044559e1ea4759..75d5e710ceee2007375e8e3b2f3f8121084e9ed6 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -67,7 +67,6 @@ Foam::processorFvPatchField<Type>::processorFvPatchField
{}
-// Construct by mapping given processorFvPatchField<Type>
template<class Type>
Foam::processorFvPatchField<Type>::processorFvPatchField
(
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 59483e6ee9fe703ffd0f829ad4727690787ed36d..c3092af3e52afb74dea2fa6a5b99b1f589fd9e2a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,13 +50,11 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
const Field<Type>& f
)
:
- //coupledFvPatchField<Type>(p, iF, f),
processorFvPatchField<Type>(p, iF, f),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{}
-// Construct by mapping given processorCyclicFvPatchField<Type>
template<class Type>
Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
(
@@ -66,7 +64,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
const fvPatchFieldMapper& mapper
)
:
- //coupledFvPatchField<Type>(ptf, p, iF, mapper),
processorFvPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{
@@ -90,7 +87,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
const dictionary& dict
)
:
- //coupledFvPatchField<Type>(p, iF, dict),
processorFvPatchField<Type>(p, iF, dict),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{
@@ -122,8 +118,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
const processorCyclicFvPatchField<Type>& ptf
)
:
- //processorLduInterfaceField(),
- //coupledFvPatchField<Type>(ptf),
processorFvPatchField<Type>(ptf),
procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
{}
@@ -136,7 +130,6 @@ Foam::processorCyclicFvPatchField<Type>::processorCyclicFvPatchField
const DimensionedField<Type, volMesh>& iF
)
:
- //coupledFvPatchField<Type>(ptf, iF),
processorFvPatchField<Type>(ptf, iF),
procPatch_(refCast<const processorCyclicFvPatch>(ptf.patch()))
{}
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 7c80ead82dc39391040641f874a9ecceffd40cbd..856c1a174f270d15a4c9f73fa276c5dcecbbbb94 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -558,7 +558,6 @@ void Foam::fvPatchField<Type>::operator/=
}
-// Force an assignment, overriding fixedValue status
template<class Type>
void Foam::fvPatchField<Type>::operator==
(
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
index aae25f976933ffd416ffcadbc21038185ef2ee3d..1b9c347b6f18784488c4e7e1e187e97abff3802e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.C
@@ -53,7 +53,6 @@ Foam::extendedCentredCellToCellStencil::extendedCentredCellToCellStencil
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Per cell which elements of the stencil to keep.
void Foam::extendedCentredCellToCellStencil::compact()
{
boolList isInStencil(map().constructSize(), false);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
index 7d2d6648c45ddce45c58f5f40aaf61ae881d28af..41e03b552d0f8534e241dfaeee255dc552914251 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Calculates per edge the neighbour data (= edgeCells)
void Foam::CECCellToCellStencil::calcEdgeBoundaryData
(
const boolList& isValidBFace,
@@ -61,8 +60,6 @@ void Foam::CECCellToCellStencil::calcEdgeBoundaryData
}
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
void Foam::CECCellToCellStencil::calcCellStencil
(
labelListList& globalCellCells
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
index df7733c46dc002c2dbe2c0c63e0dba99ff313afc..4cd4ac138964cbabb3f4d69e526368a7050e4038 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -63,6 +63,9 @@ class CECCellToCellStencil
EdgeMap<labelList>& neiGlobal
) const;
+ //- Calculates per cell the neighbour data
+ // (= cell or boundary in global numbering).
+ // First element is always cell itself!
void calcCellStencil(labelListList& globalCellCells) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
index d034b9549cf3a71b3df205fbcc0c8c7265569928..7cbde7abf8f9a110066e6ede9efd4b7aa44f955a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Calculates per face the neighbour data (= cell or boundary face)
void Foam::CFCCellToCellStencil::calcFaceBoundaryData
(
labelList& neiGlobal
@@ -82,10 +81,10 @@ void Foam::CFCCellToCellStencil::calcFaceBoundaryData
}
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
-void Foam::CFCCellToCellStencil::calcCellStencil(labelListList& globalCellCells)
- const
+void Foam::CFCCellToCellStencil::calcCellStencil
+(
+ labelListList& globalCellCells
+) const
{
const label nBnd = mesh().nFaces()-mesh().nInternalFaces();
const labelList& own = mesh().faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
index 6c7edac71e1918d4018647bd27c28e3c399b3123..fde8b11ca0cf0fd9835a367286281dbe85d2b78d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,8 +51,12 @@ class CFCCellToCellStencil
{
// Private Member Functions
+ //- Calculates per face the neighbour data (= cell or boundary face)
void calcFaceBoundaryData(labelList& neiGlobal) const;
+ //- Calculates per cell the neighbour data
+ // (= cell or boundary in global numbering).
+ // First element is always cell itself!
void calcCellStencil(labelListList& globalCellCells) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
index 024bb7e2acffded88d0ef387457b39db9bf6d69c..660a04d6d66327d63f55f25477772b968d4c24d6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Calculates per point the neighbour data (= pointCells)
void Foam::CPCCellToCellStencil::calcPointBoundaryData
(
const boolList& isValidBFace,
@@ -67,8 +66,6 @@ void Foam::CPCCellToCellStencil::calcPointBoundaryData
}
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
void Foam::CPCCellToCellStencil::calcCellStencil
(
labelListList& globalCellCells
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
index 4bb75f2ddf479284031f5a4b65d1e7702bab190e..6d82a432a8661d6ec7f81864860172461838115f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,6 +62,9 @@ class CPCCellToCellStencil
Map<labelList>& neiGlobal
) const;
+ //- Calculates per cell the neighbour data
+ // (= cell or boundary in global numbering).
+ // First element is always cell itself!
void calcCellStencil(labelListList& globalCellCells) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index fd48842f436a6f425e08c9b23fde73b6ad8bb6e1..1aad1b4e20cb51b6dc52c7aaa00aa7bf52f748b9 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Merge two list and guarantee global0,global1 are first.
void Foam::cellToCellStencil::merge
(
const label global0,
@@ -131,7 +130,6 @@ void Foam::cellToCellStencil::merge
}
-// Merge two list and guarantee globalI is first.
void Foam::cellToCellStencil::merge
(
const label globalI,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
index cb8dd8592763d33085046e0d0cb3437ccd0d0d7a..8360178c2de68d60af73948776a66b5ad150e127 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -67,16 +67,22 @@ class cellToCellStencil
protected:
//- Merge two lists.
+ // Guarantee global0, global1 are first.
static void merge
(
- const label,
- const label,
- const labelList&,
- labelList&
+ const label global0,
+ const label global1,
+ const labelList& listA,
+ labelList& listB
);
- //- Merge two lists.
- static void merge(const label, const labelList&, labelList&);
+ //- Merge two lists and guarantee globalI is first.
+ static void merge
+ (
+ const label globalI,
+ const labelList& pGlobals,
+ labelList& cCells
+ );
//- Valid boundary faces (not empty and not coupled)
void validBoundaryFaces(boolList& isValidBFace) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
index 06060c19b66b0b22d35c6f1c3e98bef4baa79b2c..5fe891d07884df4238f033aef82a0af0e3682626 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.C
@@ -53,9 +53,10 @@ Foam::extendedCentredCellToFaceStencil::extendedCentredCellToFaceStencil
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Per face which elements of the stencil to keep.
void Foam::extendedCentredCellToFaceStencil::compact()
{
+ // Per face which elements of the stencil to keep.
+
boolList isInStencil(map().constructSize(), false);
forAll(stencil_, faceI)
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
index 235091fa3ac28d8d1d242e9aa7a7f7ead2b54777..29f929c01f3e06761b3cf4a66db6e1110c27ff2f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Calculates per edge the neighbour data (= edgeCells)
void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
(
const boolList& isValidBFace,
@@ -62,8 +61,6 @@ void Foam::FECCellToFaceStencil::calcEdgeBoundaryData
}
-// Calculates per face the edge connected data (= cell or boundary in global
-// numbering).
void Foam::FECCellToFaceStencil::calcFaceStencil
(
labelListList& faceStencil
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
index 6d85ea414e51d51f3ea094ff15f3a12c8b839d67..d7c6d5c5b699f5d3f2045f2a73be2682f58db3a0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,6 +61,8 @@ class FECCellToFaceStencil
EdgeMap<labelList>& neiGlobal
) const;
+ //- Calculates per face the edge connected data
+ // (= cell or boundary in global numbering).
void calcFaceStencil(labelListList& faceStencil) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index f61744941e4a42c91ead985c4397da64465229c4..c9ac094164b228a24d728edbd21a760af185249d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Merge two list and guarantee global0,global1 are first.
void Foam::cellToFaceStencil::merge
(
const label global0,
@@ -132,7 +131,6 @@ void Foam::cellToFaceStencil::merge
}
-// Merge two list and guarantee globalI is first.
void Foam::cellToFaceStencil::merge
(
const label globalI,
@@ -338,13 +336,14 @@ Foam::labelList Foam::cellToFaceStencil::calcFaceCells
}
-// Calculates per face a list of global cell/face indices.
void Foam::cellToFaceStencil::calcFaceStencil
(
const labelListList& globalCellCells,
labelListList& faceStencil
) const
{
+ // Calculates per face a list of global cell/face indices.
+
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
const label nBnd = mesh_.nFaces()-mesh_.nInternalFaces();
const labelList& own = mesh_.faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
index 1b325ac3f54d3fd7e7253029845382a234bb807e..62b7db6f81082839a1d7d3bb7071148ab73cf161 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -67,16 +67,22 @@ class cellToFaceStencil
protected:
//- Merge two lists.
+ // Guarantee global0, global1 are first.
static void merge
(
- const label,
- const label,
- const labelList&,
- labelList&
+ const label global0,
+ const label global1,
+ const labelList& listA,
+ labelList& listB
);
- //- Merge two lists.
- static void merge(const label, const labelList&, labelList&);
+ //- Merge two lists and guarantee globalI is first.
+ static void merge
+ (
+ const label globalI,
+ const labelList& pGlobals,
+ labelList& cCells
+ );
//- Valid boundary faces (not empty and not coupled)
void validBoundaryFaces(boolList& isValidBFace) const;
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
index 1b1073cb8ccc1bf00b910f66c335d7140a104cd7..a2d40b587195a3e1d90560604af8c6520d7a1ca4 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.C
@@ -53,7 +53,6 @@ Foam::extendedCentredFaceToCellStencil::extendedCentredFaceToCellStencil
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Per face which elements of the stencil to keep.
void Foam::extendedCentredFaceToCellStencil::compact()
{
boolList isInStencil(map().constructSize(), false);
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
index 7e49959a8bad1d9686826ea14e203607100b5724..8a60abd4375c20201b8ba97b4311eb9cf2e779a7 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,8 +30,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Calculates per face the neighbour data (= faces of cell). Leaves out the
-// face itself since this is already in stencil.
void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
(
labelListList& neiGlobal
@@ -81,7 +79,7 @@ void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
// Do nothing since face itself already in stencil
}
}
- //syncTools::swapBoundaryFaceList(mesh(), neiGlobal);
+
syncTools::syncBoundaryFaceList
(
mesh(),
@@ -92,10 +90,10 @@ void Foam::CFCFaceToCellStencil::calcFaceBoundaryData
}
-// Calculates per cell the neighbour data (= cell or boundary in global
-// numbering). First element is always cell itself!
-void Foam::CFCFaceToCellStencil::calcCellStencil(labelListList& globalCellFaces)
- const
+void Foam::CFCFaceToCellStencil::calcCellStencil
+(
+ labelListList& globalCellFaces
+) const
{
const label nBnd = mesh().nFaces()-mesh().nInternalFaces();
const labelList& own = mesh().faceOwner();
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
index 29c083449e8a39f867a72d049360f6fbc26afc27..b451b6e67383e70f5883ed2a96e9484ba0f66870 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,8 +51,13 @@ class CFCFaceToCellStencil
{
// Private Member Functions
+ //- Calculates per face the neighbour data (= faces of cell).
+ // Leaves out the face itself since this is already in stencil.
void calcFaceBoundaryData(labelListList& neiGlobal) const;
+ //- Calculates per cell the neighbour data
+ // (= cell or boundary in global numbering).
+ // First element is always cell itself!
void calcCellStencil(labelListList& globalCellFaces) const;
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index a1039f2a71b54e87146a16ee774b1d4c3021d59c..cd7502a100927fff33dd43b4b525aa3d77a11671 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -156,14 +156,6 @@ void Foam::fvPatchMapper::calcAddressing() const
}
}
- //// Cater for bad mapping
- //if (nActive == 0)
- //{
- // newAddr[nActive] = 0;
- // newWeights[nActive] = 1;
- // nActive++;
- //}
-
newAddr.setSize(nActive);
newWeights.setSize(nActive);
@@ -211,7 +203,6 @@ void Foam::fvPatchMapper::clearOut()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::fvPatchMapper::fvPatchMapper
(
const fvPatch& patch,
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index c9889b70301d15692c25f4761376e1a7d6ce37bf..c2d5fbcfcabb69b7c8260cc0138e52f0fe2bc9e4 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -144,7 +144,6 @@ void Foam::fvSurfaceMapper::clearOut()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::fvSurfaceMapper::fvSurfaceMapper
(
const fvMesh& mesh,
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index bb88b6c09a23ba7ae379cdbf919bf6db64df351a..03569022229c5a75822948b21fc0180c3d25c55c 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -87,14 +87,15 @@ void Foam::fvMeshSubset::markPoints
}
-// Synchronize nCellsUsingFace on both sides of coupled patches. Marks
-// faces that become 'uncoupled' with 3.
void Foam::fvMeshSubset::doCoupledPatches
(
const bool syncPar,
labelList& nCellsUsingFace
) const
{
+ // Synchronize nCellsUsingFace on both sides of coupled patches.
+ // Marks faces that become 'uncoupled' with 3.
+
const polyBoundaryMesh& oldPatches = baseMesh().boundaryMesh();
label nUncoupled = 0;
@@ -355,7 +356,6 @@ void Foam::fvMeshSubset::subsetZones()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::fvMeshSubset::fvMeshSubset(const fvMesh& baseMesh)
:
baseMesh_(baseMesh),
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
index 6cb95ee928b9fb30f691baf50901b1533bfbd604..a4287b86756e36aaaeaa612d4ebd11d218a9585b 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.C
@@ -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-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,16 +29,17 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// Conversion is a two step process:
-// - from original (fine) patch faces to agglomerations (aggloms might not
-// be in correct patch order)
-// - from agglomerations to coarse patch faces
void Foam::singleCellFvMesh::agglomerateMesh
(
const fvMesh& mesh,
const labelListList& agglom
)
{
+ // Conversion is a two step process:
+ // - from original (fine) patch faces to agglomerations (aggloms might not
+ // be in correct patch order)
+ // - from agglomerations to coarse patch faces
+
const polyBoundaryMesh& oldPatches = mesh.boundaryMesh();
// Check agglomeration within patch face range and continuous
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
index b02e1d38f4e00792d0d6abf1095191d7d53df0a9..4c105b1025a120d56340bd7bc9d8d7c455ec3f9d 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/meshWave/wallDistData/wallDistData.C
@@ -30,7 +30,6 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
template<class TransferType>
Foam::wallDistData<TransferType>::wallDistData
(
@@ -68,7 +67,6 @@ Foam::wallDistData<TransferType>::~wallDistData()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Correct for mesh geom/topo changes
template<class TransferType>
void Foam::wallDistData<TransferType>::correct()
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 5fc0b4fa9d22e2917647636f9adccc279a0409d0..2895e1256e18767c6548586b23b930ac6cb2744c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -121,7 +121,6 @@ Foam::surfaceInterpolation::nonOrthCorrectionVectors() const
}
-// Do what is neccessary if the mesh has moved
bool Foam::surfaceInterpolation::movePoints()
{
deleteDemandDrivenData(weights_);