fiuxp staggered loadsolution

dumux/io/loadsolution.hh

@@ -134,6 +134,15 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
                 sol[eIdx][pvIdx] = vec[i++];
             }
         }
+        // for staggered face data (which is written out as VTK point data) we just read in the vector
+        else if (dataType == VTKReader::DataType::pointData && FVGridGeometry::discMethod == DiscretizationMethod::staggered)
+        {
+            if (sol.size() != vec.size())
+                DUNE_THROW(Dune::InvalidStateException, "Solution size (" << sol.size() << ") does not match input size (" << vec.size() << ")!");
+
+            for (std::size_t i = 0; i < sol.size(); ++i)
+                sol[i][pvIdx] = vec[i];
+        }
         else
         {
             std::size_t i = 0;

test/freeflow/navierstokes/CMakeLists.txt

@@ -73,8 +73,7 @@ dune_add_test(NAME test_channel_navierstokes
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes -Vtk.WriteFaceData 1")
 
 dune_add_test(NAME test_channel_navierstokes_restart
-              SOURCES test_channel.cc
-              COMPILE_DEFINITIONS ENABLE_NAVIERSTOKES=1
+              TARGET test_channel_navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy