zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patchIntersection, nonConformalMappedPolyFacesFvsPatchLabelField: Fixes for 64-bit labels

Browse Source
This commit is contained in:
Will Bainbridge
2024-04-16 09:21:24 +01:00
parent 08870e4560
commit f582eff8a7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/finiteVolume/fields/fvsPatchFields/derived/nonConformalMappedPolyFaces/nonConformalMappedPolyFacesFvsPatchLabelField.C
View File

@ -62,7 +62,7 @@ nonConformalMappedPolyFacesFvsPatchLabelField
(
db().time().processorCase()
? dict.lookup<labelList>("procOffsets")
: labelList(1, 0)
: labelList(1, label(0))
)
{
labelField::operator=

6
src/meshTools/patchIntersection/FacePatchIntersection.C
View File

@ -533,9 +533,9 @@ Foam::FacePatchIntersection<SrcPatchType, TgtPatchType>::FacePatchIntersection
inplaceRenumber(oldPointNewPoints, this->tgtEdgePoints_);
// Remove deleted points
inplaceRemove(this->faces_, -1);
inplaceRemove(this->srcEdgePoints_, -1);
inplaceRemove(this->tgtEdgePoints_, -1);
inplaceRemove(this->faces_, label(-1));
inplaceRemove(this->srcEdgePoints_, label(-1));
inplaceRemove(this->tgtEdgePoints_, label(-1));
}
// Step 6: Reporting

6
src/meshTools/patchIntersection/TriPatchIntersection.C
View File

@ -695,7 +695,7 @@ Foam::TriPatchIntersection<SrcPatchType, TgtPatchType>::edgePatchEdge
if (patchPointi == -1)
{
return pointPatchEdges[pointi] == -1 ? 0 : 1;
return pointPatchEdges[pointi] == -1 ? label(0) : label(1);
}
else
{
@ -1628,7 +1628,7 @@ Foam::TriPatchIntersection<SrcPatchType, TgtPatchType>::snapPatchFaceTris
checkPatchFace(tgtFacei, false);
// Insertion workspace
labelList insertPointis(1), insertEdgeis(2, -1), fixedEdgeis(0);
labelList insertPointis(1), insertEdgeis(2, label(-1)), fixedEdgeis(0);
// Do source-point-target-edge snapping
forAll(srcFaceSnapTgtFaceEdge, srcFacePointi)
@ -2427,7 +2427,7 @@ Foam::TriPatchIntersection<SrcPatchType, TgtPatchType>::conformPatchFaceTris
}
}
return -1;
return label(-1);
};
// Track from a point on a triangle towards a given point. Stop at an edge