From d01f09dce237dabe50e22d78881380676db3451a Mon Sep 17 00:00:00 2001
From: Tim Mattox <timothy.mattox@engilitycorp.com>
Date: Tue, 7 Mar 2017 15:23:17 -0500
Subject: [PATCH] Turn off use of OpenMP in MPIIO/dump_custom_mpiio.cpp if
 Kokkos is in use. The convert_string_omp() method breaks when Kokkos is also
 using OpenMP.

---
 src/MPIIO/dump_custom_mpiio.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MPIIO/dump_custom_mpiio.cpp b/src/MPIIO/dump_custom_mpiio.cpp
index 6e48bfa146..0b282b77ef 100644
--- a/src/MPIIO/dump_custom_mpiio.cpp
+++ b/src/MPIIO/dump_custom_mpiio.cpp
@@ -542,8 +542,8 @@ void DumpCustomMPIIO::write_string(int n, double *mybuf)
 
 #if defined(_OPENMP)
     int nthreads = omp_get_max_threads();
-    if (nthreads > 1)
-      nsme = convert_string_omp(n,mybuf);
+    if ((nthreads > 1) && !(lmp->kokkos))
+      nsme = convert_string_omp(n,mybuf); // not (yet) compatible with Kokkos
     else
       nsme = convert_string(n,mybuf);
 #else