diff --git a/src/Allwmake b/src/Allwmake index 86f16c9d3e36416864dff7ecbd229c02e5e7f770..f9d3f18099d032c85ef0d706ac6dda05a5989c45 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 3ee39e7c582fd3710ef9f0c5be033b4868055352..f1f2057a4d319dafd785d0b9a267087187ba4dc5 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_);