Skip to content
Snippets Groups Projects
Commit 56615ec4 authored by mattijs's avatar mattijs
Browse files

Merge remote-tracking branch 'origin/develop' into feature-alltoall

Conflicts:
	src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionaryIO.C
	src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
	src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C
	src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
	src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
	src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
	src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
	src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
	src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
	src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
	src/OpenFOAM/db/regIOobject/regIOobjectRead.C
	src/Pstream/dummy/UPstream.C
	src/Pstream/mpi/UPstream.C
	src/lagrangian/basic/Cloud/Cloud.C
	src/meshTools/regionSplit/regionSplit.C
parents 3ce8fabe 2a07e34f
Showing
with 79 additions and 134 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment