Revert "ENH: Adding deltaCoeff comparison code - requires fvMesh."

This reverts commit 53529c1112.
This commit is contained in:
graham
2010-12-20 11:47:09 +00:00
parent 53529c1112
commit fd59a3d590
2 changed files with 15 additions and 26 deletions

View File

@ -59,7 +59,6 @@ SourceFiles
#include "unitConversion.H" #include "unitConversion.H"
#include "transform.H" #include "transform.H"
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "Histogram.H" #include "Histogram.H"
#include "labelPair.H" #include "labelPair.H"

View File

@ -1405,11 +1405,11 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
removeUnusedCells(owner, neighbour, cellCentres); removeUnusedCells(owner, neighbour, cellCentres);
fvMesh mesh polyMesh pMesh
( (
IOobject IOobject
( (
Foam::polyMesh::defaultRegion, "cvMesh_temporary",
runTime_.timeName(), runTime_.timeName(),
runTime_, runTime_,
IOobject::NO_READ, IOobject::NO_READ,
@ -1431,33 +1431,23 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
patchSizes[p], patchSizes[p],
patchStarts[p], patchStarts[p],
p, p,
mesh.boundaryMesh() pMesh.boundaryMesh()
); );
} }
mesh.addPatches(patches); pMesh.addPatches(patches);
surfaceScalarField preCellCentreShiftDeltaCoeffs = mesh.deltaCoeffs(); pMesh.overrideCellCentres(cellCentres);
mesh.clearOut();
surfaceScalarField postCellCentreShiftDeltaCoeffs = mesh.deltaCoeffs();
surfaceScalarField deltaCoeffRatio =
postCellCentreShiftDeltaCoeffs/preCellCentreShiftDeltaCoeffs;
Info<< "deltaCoeffRatio min " << min(deltaCoeffRatio) << nl
<< "deltaCoeffRatio max " << max(deltaCoeffRatio) << endl;
timeCheck(); timeCheck();
labelHashSet wrongFaces(mesh.nFaces()/100); labelHashSet wrongFaces(pMesh.nFaces()/100);
Info << endl; Info << endl;
DynamicList<label> checkFaces(mesh.nFaces()); DynamicList<label> checkFaces(pMesh.nFaces());
const vectorField& fAreas = mesh.faceAreas(); const vectorField& fAreas = pMesh.faceAreas();
scalar faceAreaLimit = SMALL; scalar faceAreaLimit = SMALL;
@ -1478,7 +1468,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
motionSmoother::checkMesh motionSmoother::checkMesh
( (
false, false,
mesh, pMesh,
cvMeshControls().cvMeshDict().subDict("meshQualityControls"), cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
checkFaces, checkFaces,
wrongFaces wrongFaces
@ -1486,7 +1476,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
label nInvalidPolyhedra = 0; label nInvalidPolyhedra = 0;
const cellList& cells = mesh.cells(); const cellList& cells = pMesh.cells();
forAll(cells, cI) forAll(cells, cI)
{ {
@ -1512,7 +1502,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
forAllConstIter(labelHashSet, wrongFaces, iter) forAllConstIter(labelHashSet, wrongFaces, iter)
{ {
const face f = mesh.faces()[iter.key()]; const face f = pMesh.faces()[iter.key()];
forAll(f, fPtI) forAll(f, fPtI)
{ {
@ -1522,13 +1512,13 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
// // Limit connected cells // // Limit connected cells
// labelHashSet limitCells(mesh.nCells()/100); // labelHashSet limitCells(pMesh.nCells()/100);
// const labelListList& ptCells = mesh.pointCells(); // const labelListList& ptCells = pMesh.pointCells();
// forAllConstIter(labelHashSet, wrongFaces, iter) // forAllConstIter(labelHashSet, wrongFaces, iter)
// { // {
// const face f = mesh.faces()[iter.key()]; // const face f = pMesh.faces()[iter.key()];
// forAll(f, fPtI) // forAll(f, fPtI)
// { // {
@ -1543,7 +1533,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
// } // }
// } // }
// const labelListList& cellPts = mesh.cellPoints(); // const labelListList& cellPts = pMesh.cellPoints();
// forAllConstIter(labelHashSet, limitCells, iter) // forAllConstIter(labelHashSet, limitCells, iter)
// { // {