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 branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2013-08-14 15:55:06 +01:00
parent 8e79bf1b82 c9fa292746
commit ff17e1ccd9
40 changed files with 527 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
View File

@ -1152,7 +1152,12 @@ Foam::mappedPatchBase::mappedPatchBase
samplePatch_(mpb.samplePatch_),
offsetMode_(mpb.offsetMode_),
offset_(mpb.offset_),
offsets_(mpb.offsets_, mapAddressing),
offsets_
(
offsetMode_ == NONUNIFORM
? vectorField(mpb.offsets_, mapAddressing)
: vectorField(0)
),
distance_(mpb.distance_),
sameRegion_(mpb.sameRegion_),
mapPtr_(NULL),

5
src/meshTools/searchableSurface/searchableSurfaceCollection.C
View File

@ -376,7 +376,7 @@ void Foam::searchableSurfaceCollection::boundingSpheres
forAll(subCentres, i)
{
centres[coordI++] = transform_[surfI].globalPosition
centres[coordI] = transform_[surfI].globalPosition
(
cmptMultiply
(
@ -384,7 +384,8 @@ void Foam::searchableSurfaceCollection::boundingSpheres
scale_[surfI]
)
);
radiusSqr[coordI++] = maxScale*subRadiusSqr[i];
radiusSqr[coordI] = maxScale*subRadiusSqr[i];
coordI++;
}
}
}

20
src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
View File

@ -261,16 +261,16 @@ public:
// bounding boxes. The bounds are hints to the surface as for
// the range of queries it can expect. faceMap/pointMap can be
// set if the surface has done any redistribution.
virtual void distribute
(
const List<treeBoundBox>& bbs,
const bool keepNonLocal,
autoPtr<mapDistribute>& faceMap,
autoPtr<mapDistribute>& pointMap
)
{
subGeom_[0].distribute(bbs, keepNonLocal, faceMap, pointMap);
}
//virtual void distribute
//(
// const List<treeBoundBox>& bbs,
// const bool keepNonLocal,
// autoPtr<mapDistribute>& faceMap,
// autoPtr<mapDistribute>& pointMap
//)
//{
// subGeom_[0].distribute(bbs, keepNonLocal, faceMap, pointMap);
//}
//- WIP. Store element-wise field.
virtual void setField(const labelList& values)