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: decompositionMethod : move storage of dictionary to those classes that need it

Browse Source
This commit is contained in:
mattijs
2010-08-27 18:31:54 +01:00
parent 24d011372c
commit 03d98b6d22
5 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
View File

@ -53,7 +53,7 @@ protected:
// Protected data // Protected data
const dictionary decompositionDict_; const dictionary& decompositionDict_;
label nProcessors_; label nProcessors_;

9
src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
View File

@ -312,13 +312,12 @@ void Foam::multiLevelDecomp::decompose
Foam::multiLevelDecomp::multiLevelDecomp(const dictionary& decompositionDict) Foam::multiLevelDecomp::multiLevelDecomp(const dictionary& decompositionDict)
: :
decompositionMethod(decompositionDict) decompositionMethod(decompositionDict),
methodsDict_(decompositionDict_.subDict(typeName + "Coeffs"))
{ {
const dictionary& myDict = decompositionDict_.subDict(typeName + "Coeffs"); methods_.setSize(methodsDict_.size());
methods_.setSize(myDict.size());
label i = 0; label i = 0;
forAllConstIter(dictionary, myDict, iter) forAllConstIter(dictionary, methodsDict_, iter)
{ {
methods_.set(i++, decompositionMethod::New(iter().dict())); methods_.set(i++, decompositionMethod::New(iter().dict()));
} }

2
src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
View File

@ -50,6 +50,8 @@ class multiLevelDecomp
{ {
// Private data // Private data
dictionary methodsDict_;
PtrList<decompositionMethod> methods_; PtrList<decompositionMethod> methods_;

10
src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
View File

@ -49,12 +49,12 @@ namespace Foam
Foam::structuredDecomp::structuredDecomp(const dictionary& decompositionDict) Foam::structuredDecomp::structuredDecomp(const dictionary& decompositionDict)
: :
decompositionMethod(decompositionDict) decompositionMethod(decompositionDict),
methodDict_(decompositionDict_.subDict(typeName + "Coeffs"))
{ {
dictionary myDict = decompositionDict_.subDict(typeName + "Coeffs"); methodDict_.set("numberOfSubdomains", nDomains());
myDict.set("numberOfSubdomains", nDomains()); method_ = decompositionMethod::New(methodDict_);
method_ = decompositionMethod::New(myDict); patches_ = wordList(methodDict_.lookup("patches"));
patches_ = wordList(myDict.lookup("patches"));
} }

28
src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.H
View File

@ -50,6 +50,8 @@ class structuredDecomp
{ {
// Private data // Private data
dictionary methodDict_;
autoPtr<decompositionMethod> method_; autoPtr<decompositionMethod> method_;
wordList patches_; wordList patches_;
@ -57,32 +59,6 @@ class structuredDecomp
// Private Member Functions // Private Member Functions
//- Given connectivity across processors work out connectivity
// for a (consistent) subset
void subsetGlobalCellCells
(
const label nDomains,
const label domainI,
const labelList& dist,
const labelListList& cellCells,
const labelList& set,
labelListList& subCellCells,
labelList& cutConnections
) const;
//- Decompose level methodI without addressing
void decompose
(
const labelListList& pointPoints,
const pointField& points,
const scalarField& pointWeights,
const labelList& pointMap, // map back to original points
const label levelI,
labelField& finalDecomp
);
//- Disallow default bitwise copy construct and assignment //- Disallow default bitwise copy construct and assignment
void operator=(const structuredDecomp&); void operator=(const structuredDecomp&);
structuredDecomp(const structuredDecomp&); structuredDecomp(const structuredDecomp&);