Merge branch 'fix/bugs-when-using-growing-grids' into 'next'

[next] Clear local data before updating objects when grid changed

See merge request !389

dumux/discretization/cellcentered/subcontrolvolume.hh

@@ -47,7 +47,7 @@ public:
     // the contructor in the cc case
     CCSubControlVolume(Geometry&& geometry,
                        IndexType elementIndex)
-    : ParentType(), geometry_(std::move(geometry)), elementIndex_(elementIndex) {}
+    : ParentType(), geometry_(std::forward<Geometry>(geometry)), elementIndex_(elementIndex) {}
 
     //! The copy constrcutor
     CCSubControlVolume(const CCSubControlVolume& other) = default;
@@ -95,6 +95,7 @@ public:
     // e.g. for integration
     const Geometry& geometry() const
     {
+        assert((geometry_));
         return geometry_.value();
     }
 

dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh

@@ -117,6 +117,8 @@ public:
               const FVElementGeometry& fvGeometry,
               const SolutionVector& sol)
     {
+        clear();
+
         const auto& problem = globalVolVars().problem_();
         const auto globalI = problem.elementMapper().index(element);
         const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
@@ -201,6 +203,8 @@ public:
                      const FVElementGeometry& fvGeometry,
                      const SolutionVector& sol)
     {
+        clear();
+
         auto eIdx = globalVolVars().problem_().elementMapper().index(element);
         volumeVariables_.resize(1);
         volVarIndices_.resize(1);
@@ -230,6 +234,12 @@ public:
     const GlobalVolumeVariables& globalVolVars() const
     { return *globalVolVarsPtr_; }
 
+    //! Clear all local storage
+    void clear()
+    {
+        volVarIndices_.clear();
+        volumeVariables_.clear();
+    }
 private:
     const GlobalVolumeVariables* globalVolVarsPtr_;
 

dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh

@@ -499,17 +499,20 @@ private:
 
     }
 
+    //! Clear all local data
     void clear()
     {
         scvIndices_.clear();
         scvfIndices_.clear();
         scvs_.clear();
         scvfs_.clear();
+        flippedScvfIndices_.clear();
 
         neighborScvIndices_.clear();
         neighborScvfIndices_.clear();
         neighborScvs_.clear();
         neighborScvfs_.clear();
+        flippedNeighborScvfIndices_.clear();
     }
 
     // the bound element

dumux/discretization/cellcentered/tpfa/globalfvgeometry.hh

@@ -107,6 +107,7 @@ public:
         scvs_.clear();
         scvfs_.clear();
         scvfIndicesOfScv_.clear();
+        flipScvfIndices_.clear();
         elementMap_.clear();
 
         // determine size of containers
@@ -351,7 +352,11 @@ public:
     void update(const Problem& problem)
     {
         problemPtr_ = &problem;
+
+        // clear local data
         elementMap_.clear();
+        scvfIndicesOfScv_.clear();
+        neighborVolVarIndices_.clear();
 
         // reserve memory or resize the containers
         numScvs_ = gridView_.size(0);

dumux/implicit/cellcentered/assemblymap.hh

@@ -71,6 +71,7 @@ public:
      */
     void init(const Problem& problem)
     {
+        map_.clear();
         map_.resize(problem.gridView().size(0));
         for (const auto& element : elements(problem.gridView()))
         {
@@ -102,7 +103,9 @@ public:
                     if (it != dataJForI.end())
                         it->second.scvfsJ.push_back(scvf.index());
                     else
-                        dataJForI.emplace_back(std::make_pair(globalI, DataJ({globalJ, std::vector<IndexType>({scvf.index()})})));
+                        dataJForI.emplace_back(std::make_pair(globalI, DataJ({globalJ,
+                                                                              std::vector<IndexType>({scvf.index()}),
+                                                                              std::vector<IndexType>()})));
                 }
             }