fixes from Dune update

rath3t · Oct 26, 2023 · 29a9720 · 29a9720
1 parent b2cee61
commit 29a9720
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/dune/iga/nurbsgrid.hh b/dune/iga/nurbsgrid.hh
@@ -168,7 +168,7 @@ namespace Dune::IGA {
     const GridView& leafGridView() const { return *leafGridView_; }
     const GridView& levelGridView([[maybe_unused]] int level) const { return *leafGridView_; }
     int getMark(const ElementEntity& element) const { return 0; }
-    bool mark(int refCount, const ElementEntity& element) { return false; }
+    bool mark(int refCount, const ElementEntity& element) const { return false; }
 
     template <typename Seed>
     typename Codim<Seed::codimension>::Entity entity(const Seed& seed) const {

diff --git a/dune/iga/nurbsleafgridview.hh b/dune/iga/nurbsleafgridview.hh
@@ -16,7 +16,7 @@ namespace Dune::IGA {
   /** \brief Collect several types associated to OneDGrid LeafGridViews */
   template <class GridImp>
   struct NurbsLeafGridViewTraits {
-    using Grid        = GridImp;
+    using Grid        = std::remove_const_t<GridImp>;
     using IndexSet    = typename GridImp::Traits::LeafIndexSet;
     using GridViewImp = NURBSLeafGridView<const GridImp>;
 

diff --git a/dune/iga/nurbspatch.hh b/dune/iga/nurbspatch.hh
@@ -515,6 +515,8 @@ namespace Dune::IGA {
             default:  // edges 0,4,6
               break;
           }
+        default:  // dim==1
+          break;
       }
       if (returnOriginal) return dIndex;
       return getRealIndex<1>(dIndex);

diff --git a/dune/iga/test/trimmedGridTests.cc b/dune/iga/test/trimmedGridTests.cc
@@ -227,7 +227,7 @@ auto testDataCollectorAndVtkWriter() {
 
       for (auto s : std::views::iota(0, 4)) {
         Dune::Vtk::DiscontinuousIgaDataCollector dataCollector1(gv, s);
-        Dune::VtkUnstructuredGridWriter writer2(dataCollector1, Vtk::FormatTypes::ASCII);
+        Dune::Vtk::UnstructuredGridWriter writer2(dataCollector1, Vtk::FormatTypes::ASCII);
 
         writer2.addPointData(lambaGV, Dune::VTK::FieldInfo("displacement", Dune::VTK::FieldInfo::Type::vector, 2));
         auto vtkFileName = OUTPUT_FOLDER + "/" + fileName + "_r" + std::to_string(r) + "_s" + std::to_string(s);
@@ -284,7 +284,7 @@ auto testExampleSuite() {
   const auto gv = grid->leafGridView();
   Dune::Vtk::DiscontinuousIgaDataCollector dataCollector1(gv);
 
-  Dune::VtkUnstructuredGridWriter writer2(dataCollector1, Vtk::FormatTypes::ASCII);
+  Dune::Vtk::UnstructuredGridWriter writer2(dataCollector1, Vtk::FormatTypes::ASCII);
   writer2.write("TestFileTest");
   testLoop(grid, 2, "surface-multihole");