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

MRG: Integrated Foundation code to commit 19e602b

Browse Source
This commit is contained in:
Andrew Heather
2017-03-28 11:30:10 +01:00
parent b708c23cfc 19e602b065
commit 45381b1085
227 changed files with 2746 additions and 2715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sampling/meshToMesh/meshToMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -536,7 +536,7 @@ void Foam::meshToMesh::calculate(const word& methodName)
// set up as a reverse distribute
mapDistributeBase::distribute
(
Pstream::nonBlocking,
Pstream::commsTypes::nonBlocking,
List<labelPair>(),
tgtRegion_.nCells(),
map.constructMap(),
@ -552,7 +552,7 @@ void Foam::meshToMesh::calculate(const word& methodName)
// set up as a reverse distribute
mapDistributeBase::distribute
(
Pstream::nonBlocking,
Pstream::commsTypes::nonBlocking,
List<labelPair>(),
tgtRegion_.nCells(),
map.constructMap(),

4
src/sampling/meshToMesh/meshToMeshParallelOps.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -275,7 +275,7 @@ void Foam::meshToMesh::distributeCells
List<labelList>& procLocalFaceIDs
) const
{
PstreamBuffers pBufs(Pstream::nonBlocking);
PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
points.setSize(Pstream::nProcs());
nInternalFaces.setSize(Pstream::nProcs(), 0);

14
src/sampling/surface/isoSurface/isoSurface.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 | Copyright (C) 2015-2017 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -164,7 +164,11 @@ void Foam::isoSurface::syncUnseparatedPoints
patchInfo[nbrPointi] = pointValues[meshPts[pointi]];
}
OPstream toNbr(Pstream::blocking, pp.neighbProcNo());
OPstream toNbr
(
Pstream::commsTypes::blocking,
pp.neighbProcNo()
);
toNbr << patchInfo;
}
}
@ -187,7 +191,11 @@ void Foam::isoSurface::syncUnseparatedPoints
{
// We do not know the number of points on the other side
// so cannot use Pstream::read.
IPstream fromNbr(Pstream::blocking, pp.neighbProcNo());
IPstream fromNbr
(
Pstream::commsTypes::blocking,
pp.neighbProcNo()
);
fromNbr >> nbrPatchInfo;
}