exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Name clash resolution: addressing in ggi-type interfaces

Browse source
This commit is contained in:
Hrvoje Jasak 2017-11-30 23:06:34 +00:00
parent bfae309d33
commit 2c226342a0
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/ggiLduInterface/ggiLduInterface.H
View file

@ -115,7 +115,7 @@ public:
virtual const labelList& zoneAddressing() const = 0; virtual const labelList& zoneAddressing() const = 0;
//- Return fine level addressing //- Return fine level addressing
virtual const labelListList& addressing() const = 0; virtual const labelListList& ggiAddressing() const = 0;
//- Is the patch localised on a single processor //- Is the patch localised on a single processor
virtual bool localParallel() const = 0; virtual bool localParallel() const = 0;
@ -124,7 +124,7 @@ public:
virtual const mapDistribute& map() const = 0; virtual const mapDistribute& map() const = 0;
//- Return weights //- Return weights
virtual const scalarListList& weights() const = 0; virtual const scalarListList& ggiWeights() const = 0;
//- Return face transformation tensor //- Return face transformation tensor
virtual const tensorField& forwardT() const = 0; virtual const tensorField& forwardT() const = 0;

4
src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/mixingPlaneLduInterface/mixingPlaneLduInterface.H
View file

@ -98,10 +98,10 @@ public:
virtual const mixingPlaneLduInterface& shadowInterface() const = 0; virtual const mixingPlaneLduInterface& shadowInterface() const = 0;
//- Return fine level addressing //- Return fine level addressing
virtual const labelListList& addressing() const = 0; virtual const labelListList& ggiAddressing() const = 0;
//- Return weights //- Return weights
virtual const scalarListList& weights() const = 0; virtual const scalarListList& ggiWeights() const = 0;
//- Return face transformation tensor //- Return face transformation tensor
virtual const tensorField& forwardT() const = 0; virtual const tensorField& forwardT() const = 0;

14
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.C
View file

@ -367,8 +367,8 @@ Foam::ggiAMGInterface::ggiAMGInterface
{ {
// This addressing defines how to interpolate for all zone faces // This addressing defines how to interpolate for all zone faces
// across the interface // across the interface
const labelListList& fineAddr = fineGgiInterface_.addressing(); const labelListList& fineAddr = fineGgiInterface_.ggiAddressing();
const scalarListList& fineWeights = fineGgiInterface_.weights(); const scalarListList& fineWeights = fineGgiInterface_.ggiWeights();
// Perform analysis only for local faces // Perform analysis only for local faces
// HJ, 22/Jun/2016 // HJ, 22/Jun/2016
@ -1005,7 +1005,7 @@ Foam::ggiAMGInterface::ggiAMGInterface
if (fineGgiInterface_.fineLevel()) if (fineGgiInterface_.fineLevel())
{ {
const labelListList& fineAddr = const labelListList& fineAddr =
fineGgiInterface_.addressing(); fineGgiInterface_.ggiAddressing();
nbrProc = neighbourExpandProc nbrProc = neighbourExpandProc
[fineAddr[facesIter[0]][faceNbrsIter[0]]]; [fineAddr[facesIter[0]][faceNbrsIter[0]]];
@ -1141,9 +1141,9 @@ const Foam::labelList& Foam::ggiAMGInterface::zoneAddressing() const
} }
const Foam::labelListList& Foam::ggiAMGInterface::addressing() const const Foam::labelListList& Foam::ggiAMGInterface::ggiAddressing() const
{ {
FatalErrorIn("const labelListList& ggiAMGInterface::addressing() const") FatalErrorIn("const labelListList& ggiAMGInterface::ggiAddressing() const")
<< "Requested fine addressing at coarse level" << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);
@ -1183,9 +1183,9 @@ const Foam::mapDistribute& Foam::ggiAMGInterface::map() const
} }
const Foam::scalarListList& Foam::ggiAMGInterface::weights() const const Foam::scalarListList& Foam::ggiAMGInterface::ggiWeights() const
{ {
FatalErrorIn("const labelListList& ggiAMGInterface::weights() const") FatalErrorIn("const labelListList& ggiAMGInterface::ggiWeights() const")
<< "Requested fine addressing at coarse level" << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);

4
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/ggiAMGInterface/ggiAMGInterface.H
View file

@ -266,7 +266,7 @@ public:
virtual const labelList& zoneAddressing() const; virtual const labelList& zoneAddressing() const;
//- Return addressing //- Return addressing
virtual const labelListList& addressing() const; virtual const labelListList& ggiAddressing() const;
//- Is the patch localised on a single processor //- Is the patch localised on a single processor
virtual bool localParallel() const; virtual bool localParallel() const;
@ -275,7 +275,7 @@ public:
const labelListList& procMasterFaces() const; const labelListList& procMasterFaces() const;
//- Return weights //- Return weights
virtual const scalarListList& weights() const; virtual const scalarListList& ggiWeights() const;
//- Return face transformation tensor //- Return face transformation tensor
virtual const tensorField& forwardT() const; virtual const tensorField& forwardT() const;

8
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.C
View file

@ -110,11 +110,11 @@ Foam::mixingPlaneAMGInterface::shadowInterface() const
} }
const Foam::labelListList& Foam::mixingPlaneAMGInterface::addressing() const const Foam::labelListList& Foam::mixingPlaneAMGInterface::ggiAddressing() const
{ {
FatalErrorIn FatalErrorIn
( (
"const labelListList& mixingPlaneAMGInterface::addressing() const" "const labelListList& mixingPlaneAMGInterface::ggiAddressing() const"
) << "Requested fine addressing at coarse level" ) << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);
@ -122,11 +122,11 @@ const Foam::labelListList& Foam::mixingPlaneAMGInterface::addressing() const
} }
const Foam::scalarListList& Foam::mixingPlaneAMGInterface::weights() const const Foam::scalarListList& Foam::mixingPlaneAMGInterface::ggiWeights() const
{ {
FatalErrorIn FatalErrorIn
( (
"const labelListList& mixingPlaneAMGInterface::weights() const" "const labelListList& mixingPlaneAMGInterface::ggiWeights() const"
) << "Requested fine addressing at coarse level" ) << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);
return scalarListList::null(); return scalarListList::null();

4
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/AMGInterfaces/mixingPlaneAMGInterface/mixingPlaneAMGInterface.H
View file

@ -203,10 +203,10 @@ public:
virtual const mixingPlaneLduInterface& shadowInterface() const; virtual const mixingPlaneLduInterface& shadowInterface() const;
//- Return addressing //- Return addressing
virtual const labelListList& addressing() const; virtual const labelListList& ggiAddressing() const;
//- Return weights //- Return weights
virtual const scalarListList& weights() const; virtual const scalarListList& ggiWeights() const;
//- Return face transformation tensor //- Return face transformation tensor
virtual const tensorField& forwardT() const; virtual const tensorField& forwardT() const;

14
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.C
View file

@ -477,8 +477,8 @@ Foam::ggiSAMGInterface::ggiSAMGInterface
{ {
// This addressing defines how to interpolate for all zone faces // This addressing defines how to interpolate for all zone faces
// across the interface // across the interface
const labelListList& fineAddr = fineGgiInterface_.addressing(); const labelListList& fineAddr = fineGgiInterface_.ggiAddressing();
const scalarListList& fineWeights = fineGgiInterface_.weights(); const scalarListList& fineWeights = fineGgiInterface_.ggiWeights();
// Perform analysis only for local faces // Perform analysis only for local faces
// HJ, 22/Jun/2016 // HJ, 22/Jun/2016
@ -1196,7 +1196,7 @@ Foam::ggiSAMGInterface::ggiSAMGInterface
if (fineGgiInterface_.fineLevel()) if (fineGgiInterface_.fineLevel())
{ {
const labelListList& fineAddr = const labelListList& fineAddr =
fineGgiInterface_.addressing(); fineGgiInterface_.ggiAddressing();
nbrProc = neighbourExpandProc nbrProc = neighbourExpandProc
[fineAddr[facesIter[0]][faceNbrsIter[0]]]; [fineAddr[facesIter[0]][faceNbrsIter[0]]];
@ -1332,9 +1332,9 @@ const Foam::labelList& Foam::ggiSAMGInterface::zoneAddressing() const
} }
const Foam::labelListList& Foam::ggiSAMGInterface::addressing() const const Foam::labelListList& Foam::ggiSAMGInterface::ggiAddressing() const
{ {
FatalErrorIn("const labelListList& ggiSAMGInterface::addressing() const") FatalErrorIn("const labelListList& ggiSAMGInterface::ggiAddressing() const")
<< "Requested fine addressing at coarse level" << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);
@ -1374,9 +1374,9 @@ const Foam::mapDistribute& Foam::ggiSAMGInterface::map() const
} }
const Foam::scalarListList& Foam::ggiSAMGInterface::weights() const const Foam::scalarListList& Foam::ggiSAMGInterface::ggiWeights() const
{ {
FatalErrorIn("const labelListList& ggiSAMGInterface::weights() const") FatalErrorIn("const labelListList& ggiSAMGInterface::ggiWeights() const")
<< "Requested fine addressing at coarse level" << "Requested fine addressing at coarse level"
<< abort(FatalError); << abort(FatalError);

4
src/foam/matrices/lduMatrix/solvers/AMG/interfaces/SAMGInterfaces/ggiSAMGInterface/ggiSAMGInterface.H
View file

@ -282,7 +282,7 @@ public:
virtual const labelList& zoneAddressing() const; virtual const labelList& zoneAddressing() const;
//- Return addressing //- Return addressing
virtual const labelListList& addressing() const; virtual const labelListList& ggiAddressing() const;
//- Is the patch localised on a single processor //- Is the patch localised on a single processor
virtual bool localParallel() const; virtual bool localParallel() const;
@ -291,7 +291,7 @@ public:
const labelListList& procMasterFaces() const; const labelListList& procMasterFaces() const;
//- Return weights //- Return weights
virtual const scalarListList& weights() const; virtual const scalarListList& ggiWeights() const;
//- Return face transformation tensor //- Return face transformation tensor
virtual const tensorField& forwardT() const; virtual const tensorField& forwardT() const;