zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-12-09 09:11:12 +01:00
parent fd32d652c7 f5b23d5065
commit 394fcb56b0
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
Info<< "\nWall heat fluxes [W]" << endl; Info<< "\nWall heat fluxes [W]" << endl;
forAll(patchHeatFlux, patchi) forAll(patchHeatFlux, patchi)
{ {
if (typeid(mesh.boundary()) == typeid(wallFvPatch)) if (typeid(mesh.boundary()[patchi]) == typeid(wallFvPatch))
{ {
Info<< mesh.boundary()[patchi].name() Info<< mesh.boundary()[patchi].name()
<< " " << " "

7
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
View File

@ -207,8 +207,11 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
) )
{ {
fixedValueFvPatchField<Type>::autoMap(m); fixedValueFvPatchField<Type>::autoMap(m);
startSampledValues_.autoMap(m); if (startSampledValues_.size() > 0)
endSampledValues_.autoMap(m); {
startSampledValues_.autoMap(m);
endSampledValues_.autoMap(m);
}
} }

23
src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
View File

@ -97,7 +97,11 @@ void Foam::distributedTriSurfaceMesh::splitSegment
point clipPt0, clipPt1; 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 // 2. Check if fully inside other processor. Rare occurrence
@ -109,17 +113,14 @@ void Foam::distributedTriSurfaceMesh::splitSegment
{ {
const List<treeBoundBox>& bbs = procBb_[procI]; 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;
//Pout<< " Completely remote segment:" sendMap[procI].append(allSegments.size());
// << start << end << " on proc:" << procI << endl; allSegmentMap.append(segmentI);
sendMap[procI].append(allSegments.size()); allSegments.append(segment(start, end));
allSegmentMap.append(segmentI); return;
allSegments.append(segment(start, end));
return;
}
} }
} }
} }