diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt index ba3367981d67023ec117c8c8b3c8a8b094eeff0c..f9b9bea0781b8c9052866d5d8ff4e5f0e3d915ca 100644 --- a/test/freeflow/navierstokes/CMakeLists.txt +++ b/test/freeflow/navierstokes/CMakeLists.txt @@ -51,17 +51,6 @@ dune_add_test(NAME test_navierstokes_channel ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1") -dune_add_test(NAME test_navierstokes_channel_restart - TARGET test_channel - CMAKE_GUARD HAVE_UMFPACK - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes_restart-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1 -TimeLoop.DtInitial 1 -Restart.Time 1 -CellCenter.Restart.File test_channel_navierstokes-00001.vtu -Face.Restart.File test_channel_navierstokes-face-00001.vtp -Problem.Name test_channel_navierstokes_restart") - -# the restart test has to run after the test that produces the corresponding vtu file -set_tests_properties(test_navierstokes_channel_restart PROPERTIES DEPENDS test_navierstokes_channel) add_executable(test_channel_stokesni EXCLUDE_FROM_ALL test_channel.cc) target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1") diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc index e5be192cb6ba9755c9f46fe7371414ce84573343..78fc06c138e3b4852c5b6a5797f82b43d66bc956 100644 --- a/test/freeflow/navierstokes/test_channel.cc +++ b/test/freeflow/navierstokes/test_channel.cc @@ -139,21 +139,7 @@ int main(int argc, char** argv) try SolutionVector x; x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); x[FVGridGeometry::faceIdx()].resize(numDofsFace); - if (restartTime > 0) - { - using ModelTraits = typename GET_PROP_TYPE(TypeTag, ModelTraits); - - auto fileNameCell = getParamFromGroup<std::string>("CellCenter", "Restart.File"); - loadSolution(x[FVGridGeometry::cellCenterIdx()], fileNameCell, - [](int pvIdx, int state){ return "p"; }, // test option with lambda - *fvGridGeometry); - - auto fileNameFace = getParamFromGroup<std::string>("Face", "Restart.File"); - loadSolution(x[FVGridGeometry::faceIdx()], fileNameFace, - ModelTraits::primaryVariableNameFace<>, *fvGridGeometry); - } - else - problem->applyInitialSolution(x); + problem->applyInitialSolution(x); auto xOld = x; // instantiate time loop