From 159a7a5a38f3af8072dddffa9750636bd09f3e23 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 28 Sep 2022 09:24:46 +0200
Subject: [PATCH] ENH: simplify parallel/serial checks in ensight output

BUG: inadvertant type conversion in ensightFileTemplates::writeLabels
---
 src/fileFormats/ensight/file/ensightFile.H    | 14 +++---
 .../ensight/file/ensightFileTemplates.C       |  2 +-
 src/fileFormats/ensight/mesh/ensightMesh.C    |  8 ++--
 .../ensight/output/ensightOutputTemplates.C   | 47 +++----------------
 .../ensight/part/cells/ensightCellsAddr.C     |  2 +-
 src/fileFormats/vtk/file/foamVtkFileWriter.C  |  2 +-
 6 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/src/fileFormats/ensight/file/ensightFile.H b/src/fileFormats/ensight/file/ensightFile.H
index 46f328892d..ddf866c86d 100644
--- a/src/fileFormats/ensight/file/ensightFile.H
+++ b/src/fileFormats/ensight/file/ensightFile.H
@@ -214,24 +214,26 @@ public:
         void beginParticleCoordinates(const label nparticles);
 
         //- Write a list of integers
-        //  With carriage return after each value (ascii stream)
+        //  Adds newline after each value (ascii stream)
         void writeLabels(const UList<label>& list);
 
         //- Write a list of integers
-        //  With carriage return after each value (ascii stream)
+        //  Adds newline after each value (ascii stream)
         template<class Addr>
         void writeLabels(const IndirectListBase<label, Addr>& list);
 
         //- Write a list of integers as float values
-        //  With carriage return after each value (ascii stream)
+        //  Adds newline after each value (ascii stream)
         void writeList(const UList<label>& field);
 
-        //- Write a list of floats as "%12.5e" or as binary
-        //  With carriage return after each value (ascii stream)
+        //- Write a list of floating-point as "%12.5e" or as binary
+        //- (double is narrowed to float).
+        //  Adds newline after each value (ascii stream)
         void writeList(const UList<scalar>& field);
 
         //- Write an indirect list of scalars as "%12.5e" or as binary
-        //  With carriage return after each value (ascii stream)
+        //- (double is narrowed to float)
+        //  Adds newline after each value (ascii stream)
         template<class Addr>
         void writeList(const IndirectListBase<scalar, Addr>& field);
 
diff --git a/src/fileFormats/ensight/file/ensightFileTemplates.C b/src/fileFormats/ensight/file/ensightFileTemplates.C
index 87bab8f66c..5603f95dcf 100644
--- a/src/fileFormats/ensight/file/ensightFileTemplates.C
+++ b/src/fileFormats/ensight/file/ensightFileTemplates.C
@@ -47,7 +47,7 @@ bool Foam::ensightFile::hasUndef(const IndirectListBase<scalar, Addr>& field)
 template<class Addr>
 void Foam::ensightFile::writeLabels(const IndirectListBase<label, Addr>& list)
 {
-    for (const scalar val : list)
+    for (const label val : list)
     {
         write(val);
         newline();
diff --git a/src/fileFormats/ensight/mesh/ensightMesh.C b/src/fileFormats/ensight/mesh/ensightMesh.C
index 7b1a28f312..b889b524b5 100644
--- a/src/fileFormats/ensight/mesh/ensightMesh.C
+++ b/src/fileFormats/ensight/mesh/ensightMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -212,7 +212,7 @@ void Foam::ensightMesh::correct()
         const word& zoneName = czNames[zoneId];
         const cellZone& zn = mesh_.cellZones()[zoneId];
 
-        if (returnReduce(!zn.empty(), orOp<bool>()))
+        if (returnReduceOr(!zn.empty()))
         {
             // Ensure full mesh coverage
             cellSelection.resize(mesh_.nCells());
@@ -264,7 +264,7 @@ void Foam::ensightMesh::correct()
             // Unzoned cells - flip selection from zoned to unzoned
             cellSelection.flip();
 
-            if (returnReduce(cellSelection.any(), orOp<bool>()))
+            if (returnReduceOr(cellSelection.any()))
             {
                 ensightCells& part = cellZoneParts_(internalZone);
 
@@ -295,7 +295,7 @@ void Foam::ensightMesh::correct()
 
     // Face exclusion based on cellZones
 
-    if (returnReduce(!cellSelection.empty(), orOp<bool>()))
+    if (returnReduceOr(!cellSelection.empty()))
     {
         // Ensure full mesh coverage
         excludeFace.resize(mesh_.nFaces());
diff --git a/src/fileFormats/ensight/output/ensightOutputTemplates.C b/src/fileFormats/ensight/output/ensightOutputTemplates.C
index 6b43f52c1e..8a2eb9364f 100644
--- a/src/fileFormats/ensight/output/ensightOutputTemplates.C
+++ b/src/fileFormats/ensight/output/ensightOutputTemplates.C
@@ -186,15 +186,8 @@ bool Foam::ensightOutput::Detail::writeFieldComponents
 
     // Preliminary checks
     {
-        bool hasField = !fld.empty();
-
-        if (parallel)
-        {
-            reduce(hasField, orOp<bool>());
-        }
-
         // No field
-        if (!hasField) return false;
+        if (parallel ? returnReduceAnd(fld.empty()) : fld.empty()) return false;
     }
 
 
@@ -225,15 +218,8 @@ bool Foam::ensightOutput::Detail::writeFaceSubField
         // No geometry
         if (parallel ? !part.total() : !part.size()) return false;
 
-        bool hasField = !fld.empty();
-
-        if (parallel)
-        {
-            reduce(hasField, orOp<bool>());
-        }
-
         // No field
-        if (!hasField) return false;
+        if (parallel ? returnReduceAnd(fld.empty()) : fld.empty()) return false;
     }
 
 
@@ -275,22 +261,15 @@ bool Foam::ensightOutput::Detail::writeFaceLocalField
         // No geometry
         if (parallel ? !part.total() : !part.size()) return false;
 
-        bool hasField = !fld.empty();
-
-        if (parallel)
-        {
-            reduce(hasField, orOp<bool>());
-        }
-
         // No field
-        if (!hasField) return false;
+        if (parallel ? returnReduceAnd(fld.empty()) : fld.empty()) return false;
     }
 
     bool validAddressing = (part.size() == part.faceOrder().size());
 
     if (parallel)
     {
-        reduce(validAddressing, orOp<bool>());
+        Pstream::reduceOr(validAddressing);
     }
 
     if (!validAddressing)
@@ -341,15 +320,8 @@ bool Foam::ensightOutput::writeField
         // No geometry
         if (parallel ? !part.total() : !part.size()) return false;
 
-        bool hasField = !fld.empty();
-
-        if (parallel)
-        {
-            reduce(hasField, orOp<bool>());
-        }
-
         // No field
-        if (!hasField) return false;
+        if (parallel ? returnReduceAnd(fld.empty()) : fld.empty()) return false;
     }
 
 
@@ -391,15 +363,8 @@ bool Foam::ensightOutput::writeField
         // No geometry
         if (parallel ? !part.total() : !part.size()) return false;
 
-        bool hasField = !fld.empty();
-
-        if (parallel)
-        {
-            reduce(hasField, orOp<bool>());
-        }
-
         // No field
-        if (!hasField) return false;
+        if (parallel ? returnReduceAnd(fld.empty()) : fld.empty()) return false;
     }
 
 
diff --git a/src/fileFormats/ensight/part/cells/ensightCellsAddr.C b/src/fileFormats/ensight/part/cells/ensightCellsAddr.C
index ff8a7019f8..a736c2be62 100644
--- a/src/fileFormats/ensight/part/cells/ensightCellsAddr.C
+++ b/src/fileFormats/ensight/part/cells/ensightCellsAddr.C
@@ -99,7 +99,7 @@ Foam::label Foam::ensightCells::meshPointMapppings
 
     if (parallel)
     {
-        Foam::reduce(allCells, andOp<bool>());
+        Pstream::reduceAnd(allCells);
 
         if (allCells)
         {
diff --git a/src/fileFormats/vtk/file/foamVtkFileWriter.C b/src/fileFormats/vtk/file/foamVtkFileWriter.C
index 27334a2ff7..119116f9be 100644
--- a/src/fileFormats/vtk/file/foamVtkFileWriter.C
+++ b/src/fileFormats/vtk/file/foamVtkFileWriter.C
@@ -600,7 +600,7 @@ bool Foam::vtk::fileWriter::writeProcIDs(const label nValues)
     this->endDataArray();
 
     // MPI barrier
-    return parallel_ ? returnReduce(good, orOp<bool>()) : good;
+    return parallel_ ? returnReduceOr(good) : good;
 }