zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: lduPrimitiveMesh: remove stored patchAddr functionality

Browse Source
This commit is contained in:
mattijs
2013-05-02 12:37:09 +01:00
parent 5bc4cc3b7c
commit 6be54d77a1
3 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
View File

@ -308,7 +308,6 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
)
);
labelListList coarseInterfaceAddr(fineInterfaces.size());
lduInterfacePtrsList coarseInterfaces(fineInterfaces.size());
forAll(fineInterfaces, inti)
@ -334,8 +333,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
).ptr()
);
coarseInterfaceAddr[inti] = coarseInterfaces[inti].faceCells();
nPatchFaces[inti] = coarseInterfaceAddr[inti].size();
nPatchFaces[inti] = coarseInterfaces[inti].faceCells().size();
patchFineToCoarse[inti] = refCast<const GAMGInterface>
(
coarseInterfaces[inti]
@ -346,7 +344,6 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
meshLevels_[fineLevelIndex].addInterfaces
(
coarseInterfaces,
coarseInterfaceAddr,
lduPrimitiveMesh::nonBlockingSchedule<processorGAMGInterface>
(
coarseInterfaces

18
src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
View File

@ -231,12 +231,10 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
void Foam::lduPrimitiveMesh::addInterfaces
(
lduInterfacePtrsList& interfaces,
labelListList& pa,
const lduSchedule& ps
)
{
interfaces_ = interfaces;
patchAddr_ = pa;
patchSchedule_ = ps;
// Create interfaces
@ -256,7 +254,6 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
const label nCells,
labelList& l,
labelList& u,
labelListList& pa,
const Xfer<PtrList<const lduInterface> >& primitiveInterfaces,
const lduSchedule& ps,
const label comm
@ -265,7 +262,6 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
lduAddressing(nCells),
lowerAddr_(l, true),
upperAddr_(u, true),
patchAddr_(pa, true),
primitiveInterfaces_(primitiveInterfaces),
patchSchedule_(ps),
comm_(comm)
@ -301,7 +297,6 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
lduAddressing(myMesh.lduAddr().size() + size(otherMeshes)),
lowerAddr_(0),
upperAddr_(0),
patchAddr_(0),
interfaces_(0),
patchSchedule_(0),
comm_(comm)
@ -950,16 +945,6 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
}
// Extract faceCells from interfaces_
patchAddr_.setSize(interfaces_.size());
forAll(interfaces_, coarseIntI)
{
if (interfaces_.set(coarseIntI))
{
patchAddr_[coarseIntI] = interfaces_[coarseIntI].faceCells();
}
}
patchSchedule_ = nonBlockingSchedule<processorGAMGInterface>(interfaces_);
checkUpperTriangular(cellOffsets.last(), lowerAddr_, upperAddr_);
@ -1031,7 +1016,6 @@ void Foam::lduPrimitiveMesh::gather
// Construct GAMGInterfaces
lduInterfacePtrsList newInterfaces(validInterface.size());
labelListList patchAddr(validInterface.size());
forAll(validInterface, intI)
{
if (validInterface[intI])
@ -1049,14 +1033,12 @@ void Foam::lduPrimitiveMesh::gather
fromSlave
).ptr()
);
patchAddr[intI] = newInterfaces[intI].faceCells();
}
}
otherMeshes[i-1].addInterfaces
(
newInterfaces,
patchAddr,
nonBlockingSchedule<processorGAMGInterface>
(
newInterfaces

7
src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
View File

@ -60,9 +60,6 @@ class lduPrimitiveMesh
//- Upper addressing
labelList upperAddr_;
//- Patch to internal addressing
labelListList patchAddr_;
//- List of pointers for each patch
// with only those pointing to interfaces being set
lduInterfacePtrsList interfaces_;
@ -127,7 +124,6 @@ public:
void addInterfaces
(
lduInterfacePtrsList& interfaces,
labelListList& pa,
const lduSchedule& ps
);
@ -137,7 +133,6 @@ public:
const label nCells,
labelList& l,
labelList& u,
labelListList& pa,
const Xfer<PtrList<const lduInterface> >& primitiveInterfaces,
const lduSchedule& ps,
const label comm
@ -232,7 +227,7 @@ public:
//- Return patch addressing
virtual const labelUList& patchAddr(const label i) const
{
return patchAddr_[i];
return interfaces_[i].faceCells();
}
//- Return patch evaluation schedule