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/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2014-01-20 13:15:23 +00:00
parent b1e7c00952 608fe67047
commit a9ce01c68f
9 changed files with 266625 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
View File

@ -1460,41 +1460,47 @@ void Foam::extendedEdgeMesh::writeStats(Ostream& os) const
{
edgeMesh::writeStats(os);
os << indent << "point classification (size and offset) :" << nl;
os << indent << "point classification :" << nl;
os << incrIndent;
os << indent << "convex feature points : "
<< setw(8) << concaveStart_-convexStart_
<< setw(8) << convexStart_ << nl;
//<< setw(8) << convexStart_
<< nl;
os << indent << "concave feature points : "
<< setw(8) << mixedStart_-concaveStart_
<< setw(8) << concaveStart_ << nl;
//<< setw(8) << concaveStart_
<< nl;
os << indent << "mixed feature points : "
<< setw(8) << nonFeatureStart_-mixedStart_
<< setw(8) << mixedStart_ << nl;
//<< setw(8) << mixedStart_
<< nl;
os << indent << "other (non-feature) points : "
<< setw(8) << points().size()-nonFeatureStart_
<< setw(8) << nonFeatureStart_ << nl;
//<< setw(8) << nonFeatureStart_
<< nl;
os << decrIndent;
os << indent << "edge classification (size and offset) :" << nl;
os << indent << "edge classification :" << nl;
os << incrIndent;
os << indent << "external (convex angle) edges : "
<< setw(8) << internalStart_-externalStart_
<< setw(8) << externalStart_
//<< setw(8) << externalStart_
<< nl;
os << indent << "internal (concave angle) edges : "
<< setw(8) << flatStart_-internalStart_
<< setw(8) << internalStart_
//<< setw(8) << internalStart_
<< nl;
os << indent << "flat region edges : "
<< setw(8) << openStart_-flatStart_
<< setw(8) << flatStart_ << nl;
//<< setw(8) << flatStart_
<< nl;
os << indent << "open edges : "
<< setw(8) << multipleStart_-openStart_
<< setw(8) << openStart_ << nl;
//<< setw(8) << openStart_
<< nl;
os << indent << "multiply connected edges : "
<< setw(8) << edges().size()-multipleStart_
<< setw(8) << multipleStart_
//<< setw(8) << multipleStart_
<< nl;
os << decrIndent;
}

38
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
View File

@ -1375,14 +1375,14 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
patchAttraction[pointI] = rawPatchAttraction[pointI];
patchConstraints[pointI] = rawPatchConstraints[pointI];
if (multiPatchStr.valid())
{
Pout<< "Adding constraint on multiPatchPoint:"
<< pp.localPoints()[pointI]
<< " constraint:" << patchConstraints[pointI]
<< " attraction:" << patchAttraction[pointI]
<< endl;
}
//if (multiPatchStr.valid())
//{
// Pout<< "Adding constraint on multiPatchPoint:"
// << pp.localPoints()[pointI]
// << " constraint:" << patchConstraints[pointI]
// << " attraction:" << patchAttraction[pointI]
// << endl;
//}
}
}
}
@ -2153,6 +2153,28 @@ void Foam::autoSnapDriver::determineFeatures
);
}
}
else
{
// No multi-patch snapping
nearInfo = findNearFeaturePoint
(
false, // isRegionPoint
pp,
snapDist,
pointI,
estimatedPt,
// Feature-point to pp point
pointAttractor,
pointConstraints,
// Feature-edge to pp point
edgeAttractors,
edgeConstraints,
// pp point to nearest feature
patchAttraction,
patchConstraints
);
}
const pointIndexHit& info = nearInfo.second();
if (info.hit() && featurePointStr.valid())