From d70e11195cfe4d0e6711b51969b05357fccf84dd Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 25 Jan 2021 18:06:28 +0000
Subject: [PATCH] BUG: syncTools: incorrect communicator. See #1986
---
src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H | 8 ++++----
src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H | 6 +++---
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C | 3 ++-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index e22d4005796..508e3e8eb00 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
- Copyright (C) 2017-2019 OpenCFD Ltd.
+ Copyright (C) 2017-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -136,8 +136,8 @@ public:
// Read Functions
- //- Read into given buffer from given processor and return the
- // message size
+ //- Read into given buffer from given processor
+ // \return the message size
static label read
(
const commsTypes commsType,
@@ -145,7 +145,7 @@ public:
char* buf,
const std::streamsize bufSize,
const int tag = UPstream::msgType(),
- const label communicator = 0
+ const label communicator = UPstream::worldComm
);
//- Return next token from stream
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index 53918be8c40..590a58b92ba 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2014 OpenFOAM Foundation
- Copyright (C) 2017-2018 OpenCFD Ltd.
+ Copyright (C) 2017-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -104,7 +104,7 @@ public:
// Constructors
//- Construct given process index to send to and optional buffer size,
- // write format and IO version
+ //- write format and IO version
UOPstream
(
const commsTypes commsType,
@@ -146,7 +146,7 @@ public:
const char* buf,
const std::streamsize bufSize,
const int tag = UPstream::msgType(),
- const label communicator = 0
+ const label communicator = UPstream::worldComm
);
//- Write token to stream or otherwise handle it.
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index a3022e2932b..c7dbe3e2b88 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016, 2020 OpenFOAM Foundation
- Copyright (C) 2018-2020 OpenCFD Ltd.
+ Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -118,6 +118,7 @@ Foam::labelList Foam::polyMesh::facePatchFaceCells
{
FatalErrorInFunction
<< "face " << fI << " in patch " << patchID
+ << " vertices " << UIndirectList<point>(points(), curFace)
<< " does not have neighbour cell"
<< " face: " << patchFaces[fI]
<< abort(FatalError);
--
GitLab