WIP reduce duplication code

Author: aritorto

opm/grid/cpgrid/CpGrid.cpp

@@ -2196,13 +2196,10 @@ bool CpGrid::refineAndUpdateGrid(bool throwOnFailure,
                                    elemLgrAndElemLgrCorner_to_refinedLevelAndRefinedCorner,
                                    vanishedRefinedCorner_to_itsLastAppearance,
                                    markedElem_to_itsLgr,
-                                   assignRefinedLevel,
                                    preAdaptMaxLevel,
                                    markedElemAndEquivRefinedCorn_to_corner,
                                    cornerInMarkedElemWithEquivRefinedCorner,
-                                   cells_per_dim_vec,
-                                   cellRefsBoundaryInfo,
-                                   withoutFaults);
+                                   cellRefsBoundaryInfo);
 
     // Update leaf grid geometries
     // --- Adapted corners ---
@@ -2242,13 +2239,9 @@ bool CpGrid::refineAndUpdateGrid(bool throwOnFailure,
                                     elemLgrAndElemLgrCorner_to_adaptedCorner,
                                     vanishedRefinedCorner_to_itsLastAppearance,
                                     markedElem_to_itsLgr,
-                                    assignRefinedLevel,
                                     markedElemAndEquivRefinedCorn_to_corner,
                                     cornerInMarkedElemWithEquivRefinedCorner,
-                                    cells_per_dim_vec,
-                                    preAdaptMaxLevel,
-                                    cellRefsBoundaryInfo,
-                                    withoutFaults);
+                                    cellRefsBoundaryInfo);
 
     for (int level = 0; level < levels; ++level) {
         const int refinedLevelGridIdx = level + preAdaptMaxLevel +1;

opm/grid/cpgrid/LgrFaultHelpers.cpp

@@ -877,6 +877,7 @@ void addFaces(int
     }
 }
 
+
 void populateFaceData(int                                   oldGridNumFaces,
                       const Dune::cpgrid::CpGridData&       oldGrid,
                       const std::map<int,BoundaryFaceInfo>& boundaryFacesInfo,
@@ -914,6 +915,30 @@ void populateFaceData(int                                   oldGridNumFaces,
     int newGrid_num_points = 0;
     int newGrid_face_count = 0;
 
+    auto registerFace = [&](int oldFaceIdx,
+                            int newFaceIdx,
+                            int parentFaceIdx,
+                            auto&& geometry,
+                            auto&& normal,
+                            auto tag)
+    {
+        modificationMap.oldGridFaceIdx_to_newGridFaceIdxList[oldFaceIdx].push_back(newFaceIdx);
+        modificationMap.newGridFaceIdx_to_oldGridFaceIdx[newFaceIdx] = oldFaceIdx;
+
+        if (parentFaceIdx != -1) {
+            newGridFaceIdx_to_parentFaceIdx[newFaceIdx] = parentFaceIdx;
+        }
+
+        newGridFaces[newFaceIdx] = geometry;
+        mutable_newGridFaceTags[newFaceIdx] = tag;
+        mutable_newGridFaceNormals[newFaceIdx] = normal;
+
+        const auto& faceToCell = oldGrid.faceToCell(oldFaceIdx);
+        newGridGeomData.face_to_cell.appendRow(faceToCell.begin(), faceToCell.end());
+
+        ++newGrid_face_count;
+    };
+    
     for (int i = 0; i < oldGrid.numFaces(); ++i) {
 
         std::vector<int> newFaceIndices{};
@@ -925,17 +950,6 @@ void populateFaceData(int                                   oldGridNumFaces,
 
             const auto face =  Dune::cpgrid::EntityRep<1>(i, true);
 
-            modificationMap.oldGridFaceIdx_to_newGridFaceIdxList[i].push_back(newGrid_face_count);
-            modificationMap.newGridFaceIdx_to_oldGridFaceIdx[newGrid_face_count] = i;
-            
-            if (parentFaceIdx!= -1) {
-                newGridFaceIdx_to_parentFaceIdx[newGrid_face_count] = parentFaceIdx;
-            }
-
-            newGridFaces[newGrid_face_count] = (*oldGrid.getGeometry().geomVector(std::integral_constant<int,1>()))[face];
-            mutable_newGridFaceTags[newGrid_face_count] = oldGrid.faceTag(i);
-            mutable_newGridFaceNormals[newGrid_face_count] = oldGrid.faceNormals(i);
-
             std::vector<int> faceToPoint{};
             faceToPoint.reserve(oldGrid.faceToPoint(i).size());
             for (const auto& vertexIdx : oldGrid.faceToPoint(i)) {
@@ -944,25 +958,19 @@ void populateFaceData(int                                   oldGridNumFaces,
             newGrid_num_points += faceToPoint.size();
             aux_newGrid_face_to_point[newGrid_face_count] = faceToPoint;
 
-            const auto& faceToCell = oldGrid.faceToCell(i);
-            newGridGeomData.face_to_cell.appendRow(faceToCell.begin(), faceToCell.end());
-
-            ++newGrid_face_count;
+            registerFace(i,
+                         newGrid_face_count,
+                         parentFaceIdx,
+                         (*oldGrid.getGeometry().geomVector(std::integral_constant<int,1>()))[face],
+                         oldGrid.faceNormals(i),
+                         oldGrid.faceTag(i));
         }
         else {
             const auto& boundaryFaceInfo = itP->second;
             const auto& newFacesInfo = boundaryFaceInfo.vanishedCellRefFace_to_newRefinedFaces[i];
 
             if ( boundaryFaceInfo.faceFullyContainedInNeighbor[i] || newFacesInfo.empty()){ 
                 const auto face =  Dune::cpgrid::EntityRep<1>(i, true);
-                
-                modificationMap.oldGridFaceIdx_to_newGridFaceIdxList[i].push_back(newGrid_face_count);
-                modificationMap.newGridFaceIdx_to_oldGridFaceIdx[newGrid_face_count] = i;
-                newGridFaceIdx_to_parentFaceIdx[newGrid_face_count] = parentFaceIdx;
-
-                newGridFaces[newGrid_face_count] = (*oldGrid.getGeometry().geomVector(std::integral_constant<int,1>()))[face];
-                mutable_newGridFaceTags[newGrid_face_count] = oldGrid.faceTag(i);
-                mutable_newGridFaceNormals[newGrid_face_count] = oldGrid.faceNormals(i);
 
                 std::vector<int> faceToPoint{};
                 faceToPoint.reserve(oldGrid.faceToPoint(i).size());
@@ -972,24 +980,20 @@ void populateFaceData(int                                   oldGridNumFaces,
                 newGrid_num_points += faceToPoint.size();
                 aux_newGrid_face_to_point[newGrid_face_count] = faceToPoint;
 
-                const auto& faceToCell = oldGrid.faceToCell(i);
-                newGridGeomData.face_to_cell.appendRow(faceToCell.begin(), faceToCell.end());
-
-                ++newGrid_face_count;
+                registerFace(i,
+                             newGrid_face_count,
+                             parentFaceIdx,
+                             (*oldGrid.getGeometry().geomVector(std::integral_constant<int,1>()))[face],
+                             oldGrid.faceNormals(i),
+                             oldGrid.faceTag(i));
             }
             else {
                 for (const auto& [grid2_faceIdx, newFaceToCoord] : newFacesInfo) {
-
+                    
                     newFaceIndices.push_back(newGrid_face_count);
-                    modificationMap.oldGridFaceIdx_to_newGridFaceIdxList[i].push_back(newGrid_face_count);
-                    modificationMap.newGridFaceIdx_to_oldGridFaceIdx[newGrid_face_count] = i;
-                    newGridFaceIdx_to_parentFaceIdx[newGrid_face_count] = parentFaceIdx;
-
-                    const auto [faceCenter, faceArea, faceNormal] = computeFaceCenterAreaNormal(newFaceToCoord);
 
-                    newGridFaces[newGrid_face_count] = Dune::cpgrid::Geometry<2,3>(faceCenter, faceArea);
-                    mutable_newGridFaceTags[newGrid_face_count] = oldGrid.faceTag(i); // shared tag
-                    mutable_newGridFaceNormals[newGrid_face_count] = faceNormal;
+                    const auto [faceCenter, faceArea, faceNormal] =
+                        computeFaceCenterAreaNormal(newFaceToCoord);
 
                     std::vector<int> faceToPoint{};
                     faceToPoint.reserve(newFaceToCoord.size());
@@ -1012,9 +1016,12 @@ void populateFaceData(int                                   oldGridNumFaces,
                     newGrid_num_points += faceToPoint.size();
                     aux_newGrid_face_to_point[newGrid_face_count] = faceToPoint;
 
-                    const auto& face_to_cell = oldGrid.faceToCell(i);
-                    newGridGeomData.face_to_cell.appendRow(face_to_cell.begin(), face_to_cell.end());
-                    ++newGrid_face_count;
+                    registerFace(i,
+                                 newGrid_face_count,
+                                 parentFaceIdx,
+                                 Dune::cpgrid::Geometry<2,3>(faceCenter, faceArea),
+                                 faceNormal,
+                                 oldGrid.faceTag(i));
                 }
             }
         }