CONFIG: additional test for mpfr library in cgal config (#2664)

- other systems (eg, ARM64 linux with clang) do not have a separate
  mpfr library configured so also check for mpfr (gmp is assumed to be
  the same) and return corresponding cgal flavour (eg, header-no-mpfr)

src/OpenFOAM/parallel/globalIndex/globalIndex.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -489,12 +489,12 @@ public:
 
         //- Collect indirect data in processor order on master
         //  Handles contiguous/non-contiguous data, skips empty fields.
-        template<class Type, class Addr>
+        template<class ProcIDsContainer, class Type, class Addr>
         static void gather
         (
             const labelUList& offsets,  //!< offsets (master only)
             const label comm,           //!< communicator
-            const UList<int>& procIDs,
+            const ProcIDsContainer& procIDs,
             const IndirectListBase<Type, Addr>& fld,
             List<Type>& allFld,         //! output field (master only)
             const int tag = UPstream::msgType(),

src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -248,12 +248,12 @@ void Foam::globalIndex::gather
 }
 
 
-template<class Type, class Addr>
+template<class ProcIDsContainer, class Type, class Addr>
 void Foam::globalIndex::gather
 (
     const labelUList& off,  // needed on master only
     const label comm,
-    const UList<int>& procIDs,
+    const ProcIDsContainer& procIDs,
     const IndirectListBase<Type, Addr>& fld,
     List<Type>& allFld,
     const int tag,
@@ -368,7 +368,7 @@ void Foam::globalIndex::gather
         (
             offsets_,  // needed on master only
             comm,
-            UPstream::procID(comm),
+            UPstream::allProcs(comm),   // All communicator ranks
             sendData,
             allData,
             tag,
@@ -404,7 +404,7 @@ void Foam::globalIndex::gather
         (
             offsets_,  // needed on master only
             comm,
-            UPstream::procID(comm),
+            UPstream::allProcs(comm),   // All communicator ranks
             sendData,
             allData,
             tag,
@@ -622,7 +622,7 @@ void Foam::globalIndex::mpiGather
             (
                 offsets_,  // needed on master only
                 comm,
-                UPstream::procID(comm),
+                UPstream::allProcs(comm),   // All communicator ranks
                 sendData,
                 allData,
                 tag,
@@ -967,7 +967,7 @@ void Foam::globalIndex::scatter
         (
             offsets_,  // needed on master only
             comm,
-            UPstream::procID(comm),
+            UPstream::allProcs(comm),  // All communicator ranks
             allData,
             localData,
             tag,

src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -180,12 +180,26 @@ Foam::faBoundaryMesh::faBoundaryMesh
 
 void Foam::faBoundaryMesh::calcGeometry()
 {
-    // processorFaPatch geometry triggers calculation of pointNormals.
+    // processor initGeometry send/recv the following:
+    //   - edgeCentres() : faMesh::edgeCentres()
+    //   - edgeLengths() : faMesh::Le()
+    //   - edgeFaceCentres() : faMesh::areaCentres()
+    //
+    // faMesh::Le() has its own point-to-point communication (OK) but
+    // triggers either/or edgeAreaNormals(), pointAreaNormals()
+    // with their own communication that can block.
+
     // This uses parallel comms and hence will not be trigggered
     // on processors that do not have a processorFaPatch so instead
     // force construction.
+
+    (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
+    (void)mesh_.areaCentres();
+    (void)mesh_.faceAreaNormals();
+
+
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
     if
@@ -773,12 +787,15 @@ bool Foam::faBoundaryMesh::checkDefinition(const bool report) const
 
 void Foam::faBoundaryMesh::movePoints(const pointField& p)
 {
-    // processorFaPatch geometry triggers calculation of pointNormals.
-    // This uses parallel comms and hence will not be trigggered
-    // on processors that do not have a processorFaPatch so instead
-    // force construction.
+    // See comments in calcGeometry()
+
+    (void)mesh_.edgeAreaNormals();
     (void)mesh_.pointAreaNormals();
 
+    (void)mesh_.areaCentres();
+    (void)mesh_.faceAreaNormals();
+
+
     PstreamBuffers pBufs(Pstream::defaultCommsType);
 
     if

src/finiteArea/faMesh/faMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -277,6 +277,27 @@ void Foam::faMesh::clearOut() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+void Foam::faMesh::syncGeom()
+{
+    if (UPstream::parRun())
+    {
+        // areaCentres()
+        if (faceCentresPtr_)
+        {
+            faceCentresPtr_->boundaryFieldRef()
+                .evaluateCoupled<processorFaPatch>();
+        }
+
+        // faceAreaNormals()
+        if (faceAreaNormalsPtr_)
+        {
+            faceAreaNormalsPtr_->boundaryFieldRef()
+                .evaluateCoupled<processorFaPatch>();
+        }
+    }
+}
+
+
 bool Foam::faMesh::init(const bool doInit)
 {
     if (doInit)
@@ -296,18 +317,7 @@ bool Foam::faMesh::init(const bool doInit)
     // Calculate the geometry for the patches (transformation tensors etc.)
     boundary_.calcGeometry();
 
-    // Ensure processor/processor information is properly synchronised
-    if (Pstream::parRun())
-    {
-        const_cast<areaVectorField&>(areaCentres()).boundaryFieldRef()
-            .evaluateCoupled<processorFaPatch>();
-
-        // This roughly corresponds to what OpenFOAM-v2112 (and earlier) had,
-        // but should nominally be unnecessary.
-        //
-        /// const_cast<areaVectorField&>(faceAreaNormals()).boundaryFieldRef()
-        ///     .evaluateCoupled<processorFaPatch>();
-    }
+    syncGeom();
 
     return false;
 }
@@ -989,7 +999,6 @@ bool Foam::faMesh::movePoints()
 
     clearGeomNotAreas();
 
-    // To satisfy the motion interface for MeshObject, const cast is needed
     if (patchPtr_)
     {
         patchPtr_->movePoints(newPoints);
@@ -1003,6 +1012,8 @@ bool Foam::faMesh::movePoints()
 
     // Note: Fluxes were dummy?
 
+    syncGeom();
+
     return true;
 }
 

src/finiteArea/faMesh/faMesh.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -617,6 +617,10 @@ public:
         //- Initialise non-demand-driven data etc
         bool init(const bool doInit);
 
+        //- Processor/processor synchronisation for geometry fields.
+        //  Largely internal use only (slightly hacky).
+        void syncGeom();
+
 
     // Database
 

src/finiteArea/faMesh/faMeshDemandDrivenData.C

@@ -898,6 +898,12 @@ void Foam::faMesh::calcFaceCentres() const
             }
         }
     }
+
+    // Parallel consistency, exchange on processor patches
+    if (UPstream::parRun())
+    {
+        centres.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
+    }
 }
 
 
@@ -1110,6 +1116,12 @@ void Foam::faMesh::calcFaceAreaNormals() const
                 = edgeNormalsBoundary[patchi];
         }
     }
+
+    // Parallel consistency, exchange on processor patches
+    if (UPstream::parRun())
+    {
+        faceNormals.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
+    }
 }
 
 

src/finiteArea/faMesh/faMeshTools/faMeshTools.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,6 +61,8 @@ void Foam::faMeshTools::forceDemandDriven(faMesh& mesh)
     (void)mesh.pointAreaNormals();
     (void)mesh.faceCurvatures();
     (void)mesh.edgeTransformTensors();
+
+    mesh.syncGeom();
 }
 
 

src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C

@@ -1949,7 +1949,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 //        //globalBorderTris.gather
 //        //(
 //        //    UPstream::worldComm,
-//        //    UPstream::procID(Pstream::worldComm),
+//        //    UPstream::allProcs(UPstream::worldComm),
 //        //    globalBorderCentres
 //        //);
 //        pointField globalBorderCentres(allCentres);
@@ -1996,7 +1996,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 //        //globalBorderTris.scatter
 //        //(
 //        //    UPstream::worldComm,
-//        //    UPstream::procID(Pstream::worldComm),
+//        //    UPstream::allProcs(UPstream::worldComm),
 //        //    isMasterPoint
 //        //);
 //        //boolList isMasterBorder(s.size(), false);
@@ -2094,7 +2094,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
             globalTris().gather
             (
                 UPstream::worldComm,
-                UPstream::procID(Pstream::worldComm),
+                UPstream::allProcs(UPstream::worldComm),
                 allCentres
             );
         }
@@ -2144,7 +2144,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
             globalTris().scatter
             (
                 UPstream::worldComm,
-                UPstream::procID(Pstream::worldComm),
+                UPstream::allProcs(UPstream::worldComm),
                 allDistribution,
                 distribution
             );

src/surfMesh/readers/ensight/ensightSurfaceReaderTemplates.C

@@ -82,7 +82,7 @@ Foam::tmp<Foam::Field<Type>> Foam::ensightSurfaceReader::readField
         }
 
         // Check that data type is as expected
-        // (assumes OpenFOAM generated the data set)
+        // (assuming OpenFOAM generated the data set)
         string primitiveType;
         is.read(primitiveType);
 
@@ -90,7 +90,8 @@ Foam::tmp<Foam::Field<Type>> Foam::ensightSurfaceReader::readField
 
         if
         (
-            primitiveType != ensightPTraits<Type>::typeName
+            debug
+         && primitiveType != ensightPTraits<Type>::typeName
          && primitiveType != pTraits<Type>::typeName
         )
         {

wmake/scripts/have_cgal

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2018-2020 OpenCFD Ltd.
+#     Copyright (C) 2018-2023 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -14,12 +14,16 @@
 #     have_cgal
 #
 # Description
-#     Detection/setup of CGAL
+#     Detection/setup of CGAL (with/without mpfr support)
 #
 # Requires
 #     CGAL_ARCH_PATH
 # or  config.sh/CGAL (when CGAL_ARCH_PATH is empty)
 #
+# Optional
+#     MPFR_ARCH_PATH
+# or  config.sh/CGAL (when CGAL_ARCH_PATH is empty)
+#
 # Functions provided
 #     have_cgal, no_cgal, echo_cgal, query_cgal
 #
@@ -42,6 +46,7 @@
 no_cgal()
 {
     unset HAVE_CGAL CGAL_FLAVOUR CGAL_INC_DIR CGAL_LIB_DIR
+    unset HAVE_MPFR MPFR_INC_DIR MPFR_LIB_DIR
 }
 
 
@@ -56,6 +61,62 @@ echo_cgal()
 }
 
 
+# Search
+# $1 : prefix (*_ARCH_PATH, system, ...)
+#
+# On success, return 0 and export variables
+# -> HAVE_MPFR, MPFR_INC_DIR, MPFR_LIB_DIR
+search_mpfr()
+{
+    local warn # warn="==> skip mpfr"
+    local incName="mpfr.h"
+    local libName="libmpfr"
+
+    local prefix="${1:-system}"
+    local header library
+
+    # ----------------------------------
+    if isNone "$prefix"
+    then
+        [ -n "$warn" ] && echo "$warn (disabled)"
+        return 1
+    elif hasAbsdir "$prefix"
+    then
+        header=$(findFirstFile "$prefix/include/$incName")
+        library=$(findExtLib "$libName")
+    elif isSystem "$prefix"
+    then
+        header=$(findSystemInclude -name="$incName")
+        prefix=$(sysPrefix "$header")
+    else
+        unset prefix
+    fi
+    # ----------------------------------
+
+    # Header
+    [ -n "$header" ] || {
+        [ -n "$warn" ] && echo "$warn (no header)"
+        return 2
+    }
+
+    # Library may be optional - eg, header-only
+    [ -n "$library" ] \
+    || library=$(findLibrary -prefix="$prefix" -name="$libName") \
+    || {
+        [ -n "$warn" ] && echo "==> $warn (no library)"
+        return 2
+    }
+
+    # ----------------------------------
+
+    # OK
+    export HAVE_MPFR=true
+    export MPFR_ARCH_PATH="$prefix"
+    export MPFR_INC_DIR="${header%/*}"     # Basename
+    export MPFR_LIB_DIR="${library%/*}"    # Basename
+}
+
+
 # Search
 # $1 : prefix (*_ARCH_PATH, system, ...)
 #
@@ -110,6 +171,10 @@ search_cgal()
     # OK
     export HAVE_CGAL=true
     export CGAL_FLAVOUR="${flavour:-library}"
+    if [ "$HAVE_MPFR" != true ]
+    then
+        CGAL_FLAVOUR="${CGAL_FLAVOUR}-no-mpfr"
+    fi
     export CGAL_ARCH_PATH="$prefix"
     export CGAL_INC_DIR="${header%/*}"     # Basename
     export CGAL_LIB_DIR="${library%/*}"    # Basename
@@ -138,6 +203,9 @@ have_cgal()
     # Need boost for cgal
     search_boost "$BOOST_ARCH_PATH"
 
+    # May need mpfr/gmp for cgal
+    search_mpfr "$MPFR_ARCH_PATH"
+
     search_cgal "$CGAL_ARCH_PATH"
 }