Skip to content
Snippets Groups Projects
Commit ce39e71d authored by Bernd Flemisch's avatar Bernd Flemisch Committed by Kilian Weishaupt
Browse files

[test][freeflow] remove restart test

The functionality is tested in `test/io/vtk/test_vtk_staggeredfreeflowpvnames`.
parent ce83e0b9
No related branches found
No related tags found
1 merge request!1212Feature/iofields
...@@ -51,17 +51,6 @@ dune_add_test(NAME test_navierstokes_channel ...@@ -51,17 +51,6 @@ dune_add_test(NAME test_navierstokes_channel
${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_channel_navierstokes.input -Vtk.WriteFaceData 1") --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) add_executable(test_channel_stokesni EXCLUDE_FROM_ALL test_channel.cc)
target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1") target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1")
......
...@@ -139,21 +139,7 @@ int main(int argc, char** argv) try ...@@ -139,21 +139,7 @@ int main(int argc, char** argv) try
SolutionVector x; SolutionVector x;
x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter);
x[FVGridGeometry::faceIdx()].resize(numDofsFace); x[FVGridGeometry::faceIdx()].resize(numDofsFace);
if (restartTime > 0) problem->applyInitialSolution(x);
{
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);
auto xOld = x; auto xOld = x;
// instantiate time loop // instantiate time loop
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment