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

This commit is contained in:
laurence
2012-03-27 17:11:30 +01:00
7 changed files with 453 additions and 2 deletions

View File

@ -1590,7 +1590,11 @@ Foam::conformalVoronoiMesh::collapseFace
// collapseToPtI = faceBoundaryPts[0];
//
// collapseToPt =
// 0.5*(pts[faceBoundaryPts[0]] + pts[faceBoundaryPts[1]]);
// 0.5
// *(
// pts[faceBoundaryPts[0]]
// + pts[faceBoundaryPts[1]]
// );
// }
// else if (faceBoundaryPts.size() < f.size())
// {
@ -1646,7 +1650,11 @@ Foam::conformalVoronoiMesh::collapseFace
// collapseToPtI = faceBoundaryPts[0];
//
// collapseToPt =
// 0.5*(pts[faceBoundaryPts[0]] + pts[faceBoundaryPts[1]]);
// 0.5
// *(
// pts[faceBoundaryPts[0]]
// + pts[faceBoundaryPts[1]]
// );
// }
// else if (faceBoundaryPts.size() < f.size())
// {