From 3aedd6a337c4e76b6634a16de85b260b54264d7b Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 6 Sep 2019 14:08:24 -0500
Subject: [PATCH] Better conditional for call to MPI_Type_free (thanks Cliff
 Dugal)

---
 src/finalize.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/finalize.cpp b/src/finalize.cpp
index 7c39a7c198..3de20d6d09 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -127,9 +127,7 @@ int openmc_finalize()
 
   // Free all MPI types
 #ifdef OPENMC_MPI
-  int init_called;
-  MPI_Initialized(&init_called);
-  if (init_called) MPI_Type_free(&mpi::bank);
+  if (mpi::bank != MPI_DATATYPE_NULL) MPI_Type_free(&mpi::bank);
 #endif
 
   return 0;