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

src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C

@@ -47,7 +47,11 @@ addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
 
 // * * * * * * * * * * * * * 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;
     forAll(l, i)
@@ -915,6 +919,10 @@ dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
     {
         labelList neiLevel(nFaces());
 
+        for (label faceI = 0; faceI < nInternalFaces(); faceI++)
+        {
+            neiLevel[faceI] = cellLevel[faceNeighbour()[faceI]];
+        }
         for (label faceI = nInternalFaces(); faceI < nFaces(); faceI++)
         {
             neiLevel[faceI] = cellLevel[faceOwner()[faceI]];

src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C

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