COMP: circumvent aggressive compiler branch optimization (clang-17)

- it seems that both sides of the ternary are evaluated despite
  the divide-by-zero protection. Use volatile to force the compiler
  to use in-order evaluation.

src/OpenFOAM/meshes/meshShapes/edge/edgeI.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -417,10 +417,9 @@ inline Foam::vector Foam::edge::unitVec(const UList<point>& pts) const
     }
     #endif
 
-    const vector v = (pts[second()] - pts[first()]);
+    vector v = (pts[second()] - pts[first()]);
-    const scalar s(Foam::mag(v));
+    (void) v.normalise(ROOTVSMALL);
-
+    return v;
-    return s < ROOTVSMALL ? Zero : v/s;
 }
 
 

src/OpenFOAM/meshes/meshShapes/face/faceI.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,9 +103,9 @@ inline Foam::pointField Foam::face::points(const UList<point>& pts) const
 
 inline Foam::vector Foam::face::unitNormal(const UList<point>& p) const
 {
-    const vector n(areaNormal(p));
+    vector n(areaNormal(p));
-    const scalar s(Foam::mag(n));
+    (void) n.normalise(ROOTVSMALL);
-    return s < ROOTVSMALL ? Zero : n/s;
+    return n;
 }
 
 

src/OpenFOAM/meshes/primitiveShapes/line/lineI.H

@@ -129,6 +129,10 @@ template<class Point, class PointRef>
 inline Point Foam::line<Point, PointRef>::unitVec() const
 {
     const Point v = (b_ - a_);
+
+    #ifdef __clang__
+    volatile  // Use volatile to avoid aggressive branch optimization
+    #endif
     const scalar s(::Foam::mag(v));
 
     return s < ROOTVSMALL ? Zero : v/s;

src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.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.
@@ -175,9 +175,9 @@ inline Foam::vector Foam::triangle<Point, PointRef>::unitNormal
     const Point& p2
 )
 {
-    const vector n(areaNormal(p0, p1, p2));
+    vector n(areaNormal(p0, p1, p2));
-    const scalar s(::Foam::mag(n));
+    (void) n.normalise(ROOTVSMALL);
-    return s < ROOTVSMALL ? Zero : n/s;
+    return n;
 }
 
 

src/OpenFOAM/primitives/Vector/VectorI.H

@@ -120,6 +120,9 @@ inline Foam::scalar Foam::Vector<Cmpt>::dist(const Vector<Cmpt>& v2) const
 template<class Cmpt>
 inline Foam::Vector<Cmpt>& Foam::Vector<Cmpt>::normalise(const scalar tol)
 {
+    #ifdef __clang__
+    volatile  // Use volatile to avoid aggressive branch optimization
+    #endif
     const scalar s = this->mag();
 
     if (s < tol)

src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H

@@ -490,6 +490,9 @@ inline VectorSpace<Form, Cmpt, Ncmpts> normalised
     const VectorSpace<Form, Cmpt, Ncmpts>& vs
 )
 {
+    #ifdef __clang__
+    volatile  // Use volatile to avoid aggressive branch optimization
+    #endif
     const scalar s(mag(vs));
     return s < ROOTVSMALL ? Zero : vs/s;
 }

src/OpenFOAM/primitives/complex/complexI.H

@@ -210,6 +210,7 @@ inline complex sqr(const complex& c)
 //- sgn() https://en.wikipedia.org/wiki/Sign_function#Complex_signum
 inline complex sign(const complex& c)
 {
+    // TBD: Use volatile to avoid aggressive branch optimization
     const scalar s(mag(c));
     return s < ROOTVSMALL ? Zero : c/s;
 }

src/OpenFOAM/primitives/quaternion/quaternion.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -215,7 +215,7 @@ public:
 
         //- Inplace normalise the quaternion by its magnitude
         //  For small magnitudes (less than ROOTVSMALL) set to zero.
-        inline quaternion& normalise();
+        inline quaternion& normalise(const scalar tol = ROOTVSMALL);
 
 
     // Transform

src/OpenFOAM/primitives/quaternion/quaternionI.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -306,13 +306,14 @@ inline Foam::vector& Foam::quaternion::v() noexcept
 }
 
 
-inline Foam::quaternion& Foam::quaternion::normalise()
+inline Foam::quaternion& Foam::quaternion::normalise(const scalar tol)
 {
+    // TBD: Use volatile to avoid aggressive branch optimization
     const scalar s(Foam::mag(*this));
 
-    if (s < ROOTVSMALL)
+    if (s < tol)
     {
-        *this = Zero;
+        *this = Foam::zero{};
     }
     else
     {

src/finiteArea/faMesh/faMeshDemandDrivenData.C

@@ -68,6 +68,7 @@ static inline vector areaInvDistSqrWeightedNormal
     const vector& b
 )
 {
+    // TBD: Use volatile to avoid aggressive branch optimization
     const scalar s(2*magSqr(a)*magSqr(b));
 
     return s < ROOTVSMALL ? Zero : (a ^ b) / s;