From 1dc86efd26244d59c4db442ca6ee2853ac2d488d Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Mon, 5 Mar 2018 12:22:18 +0000
Subject: [PATCH] Finalize protection

---
 lib/communicator/SharedMemoryMPI.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/communicator/SharedMemoryMPI.cc b/lib/communicator/SharedMemoryMPI.cc
index 9e5d8f15..45edbb07 100644
--- a/lib/communicator/SharedMemoryMPI.cc
+++ b/lib/communicator/SharedMemoryMPI.cc
@@ -401,7 +401,10 @@ void *SharedMemory::ShmBufferTranslate(int rank,void * local_p)
 }
 SharedMemory::~SharedMemory()
 {
-  MPI_Comm_free(&ShmComm);
+  int MPI_is_finalised;  MPI_Finalized(&MPI_is_finalised);
+  if ( !MPI_is_finalised ) { 
+    MPI_Comm_free(&ShmComm);
+  }
 };
 
 }