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

Integrated Foundation code to commit 104aac5

Browse Source
This commit is contained in:
Andrew Heather
2017-05-17 16:35:18 +01:00
parent 332c8acdcd 104aac5fca
commit 91b90da4f3
590 changed files with 5963 additions and 3699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -29,8 +29,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(decompositionConstraint, 1);
defineRunTimeSelectionTable(decompositionConstraint, dictionary);
defineTypeNameAndDebug(decompositionConstraint, 1);
defineRunTimeSelectionTable(decompositionConstraint, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -41,7 +41,6 @@ Foam::decompositionConstraint::decompositionConstraint
const word& type
)
:
//coeffDict_(constraintsDict.subOrEmptyDict(type + "Coeffs"))
coeffDict_(constraintsDict)
{}

4
src/parallel/decompose/decompositionMethods/geomDecomp/geomDecomp.C
View File

@ -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-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ Foam::geomDecomp::geomDecomp
)
:
decompositionMethod(decompositionDict),
geomDecomDict_(decompositionDict.subDict(derivedType + "Coeffs")),
geomDecomDict_(decompositionDict.optionalSubDict(derivedType + "Coeffs")),
n_(geomDecomDict_.lookup("n")),
delta_(readScalar(geomDecomDict_.lookup("delta"))),
rotDelta_(I)

8
src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
View File

@ -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-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -53,8 +53,10 @@ Foam::manualDecomp::manualDecomp(const dictionary& decompositionDict)
decompositionMethod(decompositionDict),
decompDataFile_
(
decompositionDict.subDict(word(decompositionDict.lookup("method"))
+ "Coeffs").lookup("dataFile")
decompositionDict.optionalSubDict
(
word(decompositionDict.lookup("method")) + "Coeffs"
).lookup("dataFile")
)
{}

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -243,7 +243,7 @@ void Foam::multiLevelDecomp::decompose
// Retrieve original level0 dictionary and modify number of domains
dictionary::const_iterator iter =
decompositionDict_.subDict(typeName + "Coeffs").begin();
decompositionDict_.optionalSubDict(typeName + "Coeffs").begin();
dictionary myDict = iter().dict();
myDict.set("numberOfSubdomains", nTotal);
@ -330,7 +330,7 @@ void Foam::multiLevelDecomp::decompose
Foam::multiLevelDecomp::multiLevelDecomp(const dictionary& decompositionDict)
:
decompositionMethod(decompositionDict),
methodsDict_(decompositionDict_.subDict(typeName + "Coeffs"))
methodsDict_(decompositionDict_.optionalSubDict(typeName + "Coeffs"))
{
methods_.setSize(methodsDict_.size());
label i = 0;

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,7 +49,7 @@ namespace Foam
Foam::structuredDecomp::structuredDecomp(const dictionary& decompositionDict)
:
decompositionMethod(decompositionDict),
methodDict_(decompositionDict_.subDict(typeName + "Coeffs")),
methodDict_(decompositionDict_.optionalSubDict(typeName + "Coeffs")),
patches_(methodDict_.lookup("patches"))
{
methodDict_.set("numberOfSubdomains", nDomains());