Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2011-11-28 13:03:03 +00:00
69 changed files with 330 additions and 4643556 deletions

View File

@ -1255,7 +1255,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
meshPoints,
nPointFaces,
plusEqOp<label>(),
0 // null value
label(0) // null value
);
forAll(pointNormals, i)
@ -1954,7 +1954,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
pp.meshPoints(),
nPatchPointLayers,
maxEqOp<label>(),
0 // null value
label(0) // null value
);
}
}

View File

@ -587,7 +587,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
pp.meshPoints(),
isolatedPoint,
plusEqOp<label>(),
0 // null value
label(0) // null value
);
// stop layer growth on isolated faces
@ -730,7 +730,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
meshPoints,
nPointFaces,
plusEqOp<label>(),
0 // null value
label(0) // null value
);
forAll(pointNormals, i)

View File

@ -220,7 +220,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
pp.meshPoints(),
nBoundary,
plusEqOp<label>(), // combine op
0 // null value
label(0) // null value
);
forAll(avgBoundary, i)
@ -295,7 +295,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
mesh,
globalNum,
plusEqOp<label>(), // combine op
0 // null value
label(0) // null value
);
avgInternal.setSize(meshPoints.size());

View File

@ -2002,7 +2002,7 @@ void Foam::meshRefinement::updateMesh
);
// Update surfaceIndex
updateList(map.faceMap(), -1, surfaceIndex_);
updateList(map.faceMap(), label(-1), surfaceIndex_);
// Update cached intersection information
updateIntersections(changedFaces);
@ -2015,7 +2015,7 @@ void Foam::meshRefinement::updateMesh
if (userFaceData_[i].first() == KEEPALL)
{
// extend list with face-from-face data
updateList(map.faceMap(), -1, data);
updateList(map.faceMap(), label(-1), data);
}
else if (userFaceData_[i].first() == MASTERONLY)
{

View File

@ -815,7 +815,7 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::filterDuplicateFaces
mesh_,
nBafflesPerEdge,
plusEqOp<label>(), // in-place add
0 // initial value
label(0) // initial value
);
@ -2062,7 +2062,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMesh
mesh_,
pointBaffle,
maxEqOp<label>(),
-1 // null value
label(-1) // null value
);