mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge commit 'OpenCFD/master' into olesenm
This commit is contained in:
@ -64,7 +64,7 @@ int main(int argc, char *argv[])
|
||||
Info<< "\nWall heat fluxes [W]" << endl;
|
||||
forAll(patchHeatFlux, patchi)
|
||||
{
|
||||
if (typeid(mesh.boundary()) == typeid(wallFvPatch))
|
||||
if (typeid(mesh.boundary()[patchi]) == typeid(wallFvPatch))
|
||||
{
|
||||
Info<< mesh.boundary()[patchi].name()
|
||||
<< " "
|
||||
|
||||
@ -207,8 +207,11 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
|
||||
)
|
||||
{
|
||||
fixedValueFvPatchField<Type>::autoMap(m);
|
||||
startSampledValues_.autoMap(m);
|
||||
endSampledValues_.autoMap(m);
|
||||
if (startSampledValues_.size() > 0)
|
||||
{
|
||||
startSampledValues_.autoMap(m);
|
||||
endSampledValues_.autoMap(m);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -97,7 +97,11 @@ void Foam::distributedTriSurfaceMesh::splitSegment
|
||||
point clipPt0, clipPt1;
|
||||
|
||||
|
||||
// 1. Fully local already handled outside
|
||||
// 1. Fully local already handled outside. Note: retest is cheap.
|
||||
if (isLocal(procBb_[Pstream::myProcNo()], start, end))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 2. Check if fully inside other processor. Rare occurrence
|
||||
@ -109,17 +113,14 @@ void Foam::distributedTriSurfaceMesh::splitSegment
|
||||
{
|
||||
const List<treeBoundBox>& bbs = procBb_[procI];
|
||||
|
||||
forAll(bbs, bbI)
|
||||
if (isLocal(bbs, start, end))
|
||||
{
|
||||
if (bbs[bbI].contains(start) && bbs[bbI].contains(end))
|
||||
{
|
||||
//Pout<< " Completely remote segment:"
|
||||
// << start << end << " on proc:" << procI << endl;
|
||||
sendMap[procI].append(allSegments.size());
|
||||
allSegmentMap.append(segmentI);
|
||||
allSegments.append(segment(start, end));
|
||||
return;
|
||||
}
|
||||
//Pout<< " Completely remote segment:"
|
||||
// << start << end << " on proc:" << procI << endl;
|
||||
sendMap[procI].append(allSegments.size());
|
||||
allSegmentMap.append(segmentI);
|
||||
allSegments.append(segment(start, end));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user