diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 7d9a1bd170bc8ca90790b97d5eec9711f046b08f..4905efdf9e463d68b7529e55765c88d573d3ccc7 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
- Copyright (C) 2017-2023 OpenCFD Ltd.
+ Copyright (C) 2017-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -207,6 +207,9 @@ public:
//- Magnitude of face area
inline scalar mag(const UList<point>& p) const;
+ //- Magnitude squared of face area
+ inline scalar magSqr(const UList<point>& p) const;
+
//- The enclosing (bounding) box for the face
inline Pair<point> box(const UList<point>& pts) const;
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index 36c535a9ce6e2823bbc931f2c3d6b1bf6d53c156..5f2e3698a64ae0e869f6abf769b31b8e04a165e6 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
- Copyright (C) 2017-2023 OpenCFD Ltd.
+ Copyright (C) 2017-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -115,6 +115,12 @@ inline Foam::scalar Foam::face::mag(const UList<point>& p) const
}
+inline Foam::scalar Foam::face::magSqr(const UList<point>& p) const
+{
+ return ::Foam::magSqr(areaNormal(p));
+}
+
+
inline Foam::Pair<Foam::point>
Foam::face::box(const UList<point>& pts) const
{
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 3145dca25adebf7bddedf42cec8ac66163848e54..3a2ea0da44a0faef55cb2ad0454ed8945b5cf9a9 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -181,6 +181,9 @@ public:
//- Magnitude of face area
inline scalar mag(const UList<point>& points) const;
+ //- Magnitude squared of face area
+ inline scalar magSqr(const UList<point>& points) const;
+
//- The enclosing (bounding) box for the face
inline Pair<point> box(const UList<point>& points) const;
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 2832c6ff2c970ecc90de7cb7f2fb8d3e4dfd7c8a..3eb283a916882f95fd728a81d9f9b23d66ebe55a 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
- Copyright (C) 2017-2023 OpenCFD Ltd.
+ Copyright (C) 2017-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -201,6 +201,12 @@ inline Foam::scalar Foam::triFace::mag(const UList<point>& points) const
}
+inline Foam::scalar Foam::triFace::magSqr(const UList<point>& points) const
+{
+ return ::Foam::magSqr(areaNormal(points));
+}
+
+
inline Foam::Pair<Foam::point>
Foam::triFace::box(const UList<point>& points) const
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index ea0bfbbc8484637f7c4cb48985745ec628f17199..dfe502034f1826ba7f80b7a42702980cb5a75e15 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -53,8 +53,8 @@ namespace Foam
Foam::label Foam::cyclicPolyPatch::findMaxArea
(
- const pointField& points,
- const faceList& faces
+ const UList<point>& points,
+ const UList<face>& faces
)
{
label maxI = -1;
@@ -62,7 +62,7 @@ Foam::label Foam::cyclicPolyPatch::findMaxArea
forAll(faces, facei)
{
- scalar areaSqr = magSqr(faces[facei].areaNormal(points));
+ scalar areaSqr = faces[facei].magSqr(points);
if (maxAreaSqr < areaSqr)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 19d0c9406e22e33bbc07cab039a607e623353a76..05437a4c3ca5c048b8dbc91d55dfb2e73f99876a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -112,7 +112,7 @@ class cyclicPolyPatch
// Private Member Functions
//- Find amongst selected faces the one with the largest area
- static label findMaxArea(const pointField&, const faceList&);
+ static label findMaxArea(const UList<point>&, const UList<face>&);
void calcTransforms
(
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index 26f114c46bd6f84f9e87ad6ca9d19287fcd63b77..d1147f826c05e8ec2a892f83fc018eeb81223ae0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -85,8 +85,8 @@ Foam::pointField Foam::oldCyclicPolyPatch::getAnchorPoints
Foam::label Foam::oldCyclicPolyPatch::findMaxArea
(
- const pointField& points,
- const faceList& faces
+ const UList<point>& points,
+ const UList<face>& faces
)
{
label maxI = -1;
@@ -94,7 +94,7 @@ Foam::label Foam::oldCyclicPolyPatch::findMaxArea
forAll(faces, facei)
{
- scalar areaSqr = magSqr(faces[facei].areaNormal(points));
+ scalar areaSqr = faces[facei].magSqr(points);
if (maxAreaSqr < areaSqr)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
index 4d57a7cbcbb2ecf0fed2d779069ee726cd4c4479..3a04226c27ea9b3740d6059d29d822b3197da50b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef oldCyclicPolyPatch_H
-#define oldCyclicPolyPatch_H
+#ifndef Foam_oldCyclicPolyPatch_H
+#define Foam_oldCyclicPolyPatch_H
#include "coupledPolyPatch.H"
@@ -80,7 +80,7 @@ class oldCyclicPolyPatch
// Private member functions
//- Find amongst selected faces the one with the largest area
- static label findMaxArea(const pointField&, const faceList&);
+ static label findMaxArea(const UList<point>&, const UList<face>&);
void calcTransforms();
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/line.H b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
index 0120e25aa355b1bcdf9543e013101ee3e07ce085..2ad3fe8ced672f273e8499f7438dbf497067eb05 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/line.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
- Copyright (C) 2018-2022 OpenCFD Ltd.
+ Copyright (C) 2018-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -128,6 +128,9 @@ public:
//- The magnitude (length) of the line
inline scalar mag() const;
+ //- The magnitude squared (length squared) of the line
+ inline scalar magSqr() const;
+
//- Return start-to-end vector
inline vector vec() const;
@@ -214,6 +217,9 @@ public:
//- The magnitude (length) of the line
inline scalar mag() const;
+ //- The magnitude squared (length squared) of the line
+ inline scalar magSqr() const;
+
//- Return start-to-end vector
inline Point vec() const;
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
index 132535f11929ee4b51856d2bddf4f75501cf9b57..9eb7a2ed7952c194cd974bb2ff98f438e38363bf 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
- Copyright (C) 2018-2022 OpenCFD Ltd.
+ Copyright (C) 2018-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -112,6 +112,19 @@ inline Foam::scalar Foam::linePoints::mag() const
}
+template<class Point, class PointRef>
+inline Foam::scalar Foam::line<Point, PointRef>::magSqr() const
+{
+ return ::Foam::magSqr(b() - a());
+}
+
+
+inline Foam::scalar Foam::linePoints::magSqr() const
+{
+ return ::Foam::magSqr(b() - a());
+}
+
+
template<class Point, class PointRef>
inline Point Foam::line<Point, PointRef>::vec() const
{
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
index f9767cd3dbbdfed81955caaaa99f420908a74926..0f48056c3641fb5c9ae9a2a2039a9680d1ea5951 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
- Copyright (C) 2018-2024 OpenCFD Ltd.
+ Copyright (C) 2018-2025 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -161,6 +161,9 @@ public:
//- The magnitude of the triangle area
inline scalar mag() const;
+ //- The magnitude squared of the triangle area
+ inline scalar magSqr() const;
+
//- The enclosing (bounding) box for the triangle
inline Pair<point> box() const;
@@ -378,6 +381,9 @@ public:
//- The magnitude of the triangle area
inline scalar mag() const;
+ //- The magnitude squared of the triangle area
+ inline scalar magSqr() const;
+
//- The enclosing (bounding) box for the triangle
inline Pair<Point> box() const;
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index 1014b5696215b5b6604695767b1d715bb878f173..1e5a7bd25dfbf62fe5b0c9b842f24c34c0e84116 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -319,6 +319,19 @@ inline Foam::scalar Foam::triangle<Point, PointRef>::mag() const
}
+inline Foam::scalar Foam::triPoints::magSqr() const
+{
+ return ::Foam::magSqr(areaNormal());
+}
+
+
+template<class Point, class PointRef>
+inline Foam::scalar Foam::triangle<Point, PointRef>::magSqr() const
+{
+ return ::Foam::magSqr(areaNormal());
+}
+
+
template<class Point, class PointRef>
inline Point Foam::triangle<Point, PointRef>::circumCentre() const
{
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 380bc5080325ee944345c18b0fcac58886465d3e..c1070f9018eb3df3ce58ee012ad9741c35514a38 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -431,7 +431,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
{
const edge& e = mesh_.edges()[edgeI];
- scalar edgeLenSqr = magSqr(e.vec(mesh_.points()));
+ scalar edgeLenSqr = e.magSqr(mesh_.points());
typEdgeLenSqr[eLevel] = min(typEdgeLenSqr[eLevel], edgeLenSqr);
}
@@ -468,7 +468,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
{
const edge& e = mesh_.edges()[cEdges[i]];
- scalar edgeLenSqr = magSqr(e.vec(mesh_.points()));
+ scalar edgeLenSqr = e.magSqr(mesh_.points());
maxEdgeLenSqr[cLevel] = max(maxEdgeLenSqr[cLevel], edgeLenSqr);
}