From 83fb48678d75044906cfa188e1c13d92e86235e0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 4 Nov 2020 10:23:28 +0100
Subject: [PATCH] COMP: adjust build order
- blockMesh <- extrudeModel <- dynamicMesh
COMP: bad constructor in searchableSphere
- used brace initializer instead of bracket initializer, which
triggered component-wise construction instead of copy/move
construction (gcc 4.8)
STYLE: use uint8_t instead of relying on definition of 'direction'
---
src/Allwmake | 8 ++++----
.../searchableSphere/searchableSphere.C | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Allwmake b/src/Allwmake
index 86f16c9d3e3..f9d3f18099d 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -52,8 +52,10 @@ wmake $targetType meshTools
wmake $targetType finiteArea
wmake $targetType finiteVolume
wmake $targetType genericPatchFields
-wmake $targetType mesh/extrudeModel
-wmake $targetType dynamicMesh
+
+wmake $targetType mesh/blockMesh
+wmake $targetType mesh/extrudeModel # Requires: blockMesh
+wmake $targetType dynamicMesh # Requires: extrudeModel
wmake $targetType parallel/decompose/decompositionMethods
@@ -87,8 +89,6 @@ lagrangian/Allwmake $targetType $*
wmake $targetType fvOptions
wmake $targetType fvMotionSolver
-# Ensure we have block.H accessible before building overset
-wmake $targetType mesh/blockMesh
wmake $targetType overset
# snappyHexMesh uses overset voxelMesh
diff --git a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C
index 3ee39e7c582..f1f2057a4d3 100644
--- a/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C
+++ b/src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C
@@ -524,7 +524,7 @@ Foam::searchableSphere::getOrdering(const vector& radii)
}
#endif
- std::array<direction, 3> idx{0, 1, 2};
+ std::array<uint8_t, 3> idx{0, 1, 2};
// Reverse sort by magnitude (largest first...)
// Radii are positive (checked above, or just always true)
@@ -532,7 +532,7 @@ Foam::searchableSphere::getOrdering(const vector& radii)
(
idx.begin(),
idx.end(),
- [&](direction a, direction b){ return radii[a] > radii[b]; }
+ [&](uint8_t a, uint8_t b){ return radii[a] > radii[b]; }
);
componentOrder order{idx[0], idx[1], idx[2], shapeType::GENERAL};
@@ -797,7 +797,7 @@ Foam::searchableSphere::searchableSphere
searchableSurface(io),
origin_(origin),
radii_(radii),
- order_{getOrdering(radii_)}
+ order_(getOrdering(radii_)) // NB: use () not {} for copy initialization
{
bounds().min() = (centre() - radii_);
bounds().max() = (centre() + radii_);
--
GitLab