From c478cf3b882260e65d8c23b62344feed50f9a5f3 Mon Sep 17 00:00:00 2001
From: Thomas Jahns <jahns@dkrz.de>
Date: Thu, 14 Apr 2022 20:45:29 +0200
Subject: [PATCH] Fix incorrect preprocessor conditional and variable scope.
---
src/pio_server.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/pio_server.c b/src/pio_server.c
index c4131969b..e728e4122 100644
--- a/src/pio_server.c
+++ b/src/pio_server.c
@@ -2153,8 +2153,9 @@ cdiPioServerStreamClose(stream_t *streamptr, int recordBufIsToBeDeleted)
= (void (*)(int))conf->callbacks[CDIPIO_CALLBACK_POSTSTREAMCLOSE];
streamCloseCallBack(streamptr->self);
}
+
#if defined HAVE_NC4HDF5 && defined HAVE_PARALLEL_NC4
-bool parH5ZeroCountProblem = false;
+static bool parH5ZeroCountProblem = false;
#endif
#ifdef HAVE_LIBNETCDF
@@ -2165,7 +2166,11 @@ cdiPioCdfDefTimestep(stream_t *streamptr, int tsID, size_t valCount)
rankOpen = cdiPioStream2Owner(streamID);
#ifdef HAVE_PARALLEL_NC4
valCount = rankOpen != CDI_PIO_COLLECTIVE_OPEN
- || parH5ZeroCountProblem
+#if defined HAVE_NC4HDF5
+ || (parH5ZeroCountProblem && streamptr->filetype == CDI_FILETYPE_NC4)
+#else
+ || streamptr->filetype == CDI_FILETYPE_NC4
+#endif
|| commInqRankColl() == 0;
#endif
if (commInqIOMode() == PIO_NONE
--
GitLab