Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2009-07-23 12:28:10 +01:00
2 changed files with 11 additions and 4 deletions

View File

@ -47,7 +47,11 @@ addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
label dynamicRefineFvMesh::count(const PackedBoolList& l, const unsigned int val) label dynamicRefineFvMesh::count
(
const PackedBoolList& l,
const unsigned int val
)
{ {
label n = 0; label n = 0;
forAll(l, i) forAll(l, i)
@ -915,6 +919,10 @@ dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
{ {
labelList neiLevel(nFaces()); labelList neiLevel(nFaces());
for (label faceI = 0; faceI < nInternalFaces(); faceI++)
{
neiLevel[faceI] = cellLevel[faceNeighbour()[faceI]];
}
for (label faceI = nInternalFaces(); faceI < nFaces(); faceI++) for (label faceI = nInternalFaces(); faceI < nFaces(); faceI++)
{ {
neiLevel[faceI] = cellLevel[faceOwner()[faceI]]; neiLevel[faceI] = cellLevel[faceOwner()[faceI]];

View File

@ -1022,8 +1022,7 @@ void Foam::refinementHistory::compact()
} }
splitCells_.transfer(newSplitCells); splitCells_.transfer(newSplitCells);
freeSplitCells_.clear(); freeSplitCells_.clearStorage();
freeSplitCells_.labelList::clear();
if (debug) if (debug)
@ -1142,7 +1141,7 @@ bool Foam::refinementHistory::writeData(Ostream& os) const
Foam::Istream& Foam::operator>>(Istream& is, refinementHistory& rh) Foam::Istream& Foam::operator>>(Istream& is, refinementHistory& rh)
{ {
rh.freeSplitCells_.clear(); rh.freeSplitCells_.clearStorage();
is >> rh.splitCells_ >> rh.visibleCells_; is >> rh.splitCells_ >> rh.visibleCells_;