mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
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'
This commit is contained in:
@ -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
|
||||
|
||||
@ -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_);
|
||||
|
||||
Reference in New Issue
Block a user