Commit 0fe65983 authored by Timo Koch's avatar Timo Koch Committed by Dennis Gläser
Browse files

[test] Rename gridcreator tests to gridamager

parent 51802299
add_subdirectory("gnuplotinterface")
add_subdirectory("gridcreator")
add_subdirectory("gridmanager")
add_subdirectory("container")
add_input_file_links()
dune_symlink_to_source_files(FILES grids)
dune_add_test(NAME test_gridcreator_cake
SOURCES test_gridcreator_cake.cc
dune_add_test(NAME test_gridmanager_cake
SOURCES test_gridmanager_cake.cc
CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_cake"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_cake"
--files ${CMAKE_SOURCE_DIR}/test/references/cake-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/cake-00000.vtu)
dune_add_test(NAME test_gridcreator_subgrid
SOURCES test_gridcreator_subgrid.cc
dune_add_test(NAME test_gridmanager_subgrid
SOURCES test_gridmanager_subgrid.cc
CMAKE_GUARD dune-subgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_subgrid"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_subgrid"
--files ${CMAKE_SOURCE_DIR}/test/references/subgrid-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/subgrid_three.vtu)
dune_symlink_to_source_files(FILES "test_gridcreator_gmsh_3d.input"
"test_gridcreator_gmsh_e_markers.input"
"test_gridcreator_dgf_e_markers.input")
dune_symlink_to_source_files(FILES "test_gridmanager_gmsh_3d.input"
"test_gridmanager_gmsh_e_markers.input"
"test_gridmanager_dgf_e_markers.input")
add_executable(test_gridcreator_gmsh_3d_alu EXCLUDE_FROM_ALL test_gridcreator_gmsh_3d.cc)
target_compile_definitions(test_gridcreator_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>)
add_executable(test_gridmanager_gmsh_3d_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc)
target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::nonconforming>)
dune_add_test(NAME test_gridcreator_gmsh_3d_alu_sequential
TARGET test_gridcreator_gmsh_3d_alu
dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
TARGET test_gridmanager_gmsh_3d_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_alu -Problem.Name bifurcation_alu -Grid.Refine false"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_alu -Problem.Name bifurcation_alu -Grid.Refine false"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_alu-00000.vtu)
dune_add_test(NAME test_gridcreator_gmsh_3d_alu_parallel
TARGET test_gridcreator_gmsh_3d_alu
dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel
TARGET test_gridmanager_gmsh_3d_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_alu -Problem.Name bifurcation_alu_parallel -Grid.Refine false"
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_alu -Problem.Name bifurcation_alu_parallel -Grid.Refine false"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_alu_parallel-00000.pvtu)
add_executable(test_gridcreator_gmsh_3d_ug EXCLUDE_FROM_ALL test_gridcreator_gmsh_3d.cc)
target_compile_definitions(test_gridcreator_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGGrid<3>)
add_executable(test_gridmanager_gmsh_3d_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_3d.cc)
target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGGrid<3>)
dune_add_test(NAME test_gridcreator_gmsh_3d_ug_sequential
TARGET test_gridcreator_gmsh_3d_ug
dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
TARGET test_gridmanager_gmsh_3d_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_ug -Problem.Name bifurcation_ug"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_ug -Problem.Name bifurcation_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_ug-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/bifurcation_ug-00001.vtu)
dune_add_test(NAME test_gridcreator_gmsh_3d_ug_parallel
TARGET test_gridcreator_gmsh_3d_ug
dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel
TARGET test_gridmanager_gmsh_3d_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_3d_ug -Problem.Name bifurcation_ug_parallel"
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_3d_ug -Problem.Name bifurcation_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_ug_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/bifurcation_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-bifurcation_ug_parallel-00001.pvtu)
add_executable(test_gridcreator_gmsh_e_markers_alu EXCLUDE_FROM_ALL test_gridcreator_gmsh_e_markers.cc)
target_compile_definitions(test_gridcreator_gmsh_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
add_executable(test_gridmanager_gmsh_e_markers_alu EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc)
target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
dune_add_test(NAME test_gridcreator_gmsh_e_markers_alu_sequential
TARGET test_gridcreator_gmsh_e_markers_alu
dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
TARGET test_gridmanager_gmsh_e_markers_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_alu -Problem.Name fracture_alu"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_alu -Problem.Name fracture_alu"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_alu-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_alu-00001.vtu)
dune_add_test(NAME test_gridcreator_gmsh_e_markers_alu_parallel
TARGET test_gridcreator_gmsh_e_markers_alu
dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel
TARGET test_gridmanager_gmsh_e_markers_alu
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_alu -Problem.Name fracture_alu_parallel"
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_alu -Problem.Name fracture_alu_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_alu_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/fracture_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_alu_parallel-00001.pvtu)
add_executable(test_gridcreator_gmsh_e_markers_ug EXCLUDE_FROM_ALL test_gridcreator_gmsh_e_markers.cc)
target_compile_definitions(test_gridcreator_gmsh_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
add_executable(test_gridmanager_gmsh_e_markers_ug EXCLUDE_FROM_ALL test_gridmanager_gmsh_e_markers.cc)
target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
dune_add_test(NAME test_gridcreator_gmsh_e_markers_ug_sequential
TARGET test_gridcreator_gmsh_e_markers_ug
dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
TARGET test_gridmanager_gmsh_e_markers_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_ug -Problem.Name fracture_ug"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_ug -Problem.Name fracture_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_ug-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/fracture_ug-00001.vtu)
dune_add_test(NAME test_gridcreator_gmsh_e_markers_ug_parallel
TARGET test_gridcreator_gmsh_e_markers_ug
dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel
TARGET test_gridmanager_gmsh_e_markers_ug
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh_e_markers_ug -Problem.Name fracture_ug_parallel"
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_gmsh_e_markers_ug -Problem.Name fracture_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_ug_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/fracture_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-fracture_ug_parallel-00001.pvtu)
add_executable(test_gridcreator_dgf_e_markers_alu EXCLUDE_FROM_ALL test_gridcreator_dgf_e_markers.cc)
target_compile_definitions(test_gridcreator_dgf_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
add_executable(test_gridmanager_dgf_e_markers_alu EXCLUDE_FROM_ALL test_gridmanager_dgf_e_markers.cc)
target_compile_definitions(test_gridmanager_dgf_e_markers_alu PUBLIC GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>)
dune_add_test(NAME test_gridcreator_dgf_e_markers_alu_sequential
TARGET test_gridcreator_dgf_e_markers_alu
dune_add_test(NAME test_gridmanager_dgf_e_markers_alu_sequential
TARGET test_gridmanager_dgf_e_markers_alu
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_alu -Problem.Name co2_alu"
--files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_alu -Problem.Name co2_alu"
--files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_alu-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference-refined.vtu
${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_alu-00001.vtu)
dune_add_test(NAME test_gridcreator_dgf_e_markers_alu_parallel
TARGET test_gridcreator_dgf_e_markers_alu
dune_add_test(NAME test_gridmanager_dgf_e_markers_alu_parallel
TARGET test_gridmanager_dgf_e_markers_alu
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_alu -Problem.Name co2_alu_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference.vtu
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_alu -Problem.Name co2_alu_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_alu_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_alu-reference-refined.vtu
${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_alu-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_alu_parallel-00001.pvtu)
add_executable(test_gridcreator_dgf_e_markers_ug EXCLUDE_FROM_ALL test_gridcreator_dgf_e_markers.cc)
target_compile_definitions(test_gridcreator_dgf_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
add_executable(test_gridmanager_dgf_e_markers_ug EXCLUDE_FROM_ALL test_gridmanager_dgf_e_markers.cc)
target_compile_definitions(test_gridmanager_dgf_e_markers_ug PUBLIC GRIDTYPE=Dune::UGGrid<2>)
dune_add_test(NAME test_gridcreator_dgf_e_markers_ug_sequential
TARGET test_gridcreator_dgf_e_markers_ug
dune_add_test(NAME test_gridmanager_dgf_e_markers_ug_sequential
TARGET test_gridmanager_dgf_e_markers_ug
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_ug -Problem.Name co2_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_ug -Problem.Name co2_ug"
--files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_ug-00000.vtu
${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference-refined.vtu
${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_ug-00001.vtu)
dune_add_test(NAME test_gridcreator_dgf_e_markers_ug_parallel
TARGET test_gridcreator_dgf_e_markers_ug
dune_add_test(NAME test_gridmanager_dgf_e_markers_ug_parallel
TARGET test_gridmanager_dgf_e_markers_ug
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_dgf_e_markers_ug -Problem.Name co2_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference.vtu
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_gridmanager_dgf_e_markers_ug -Problem.Name co2_ug_parallel"
--files ${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_ug_parallel-00000.pvtu
${CMAKE_SOURCE_DIR}/test/references/gridcreator-co2_ug-reference-refined.vtu
${CMAKE_SOURCE_DIR}/test/references/gridmanager-co2_ug-reference-refined.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-co2_ug_parallel-00001.pvtu)
......@@ -64,7 +64,7 @@ int main(int argc, char** argv) try
GridManager gridManager;
// first read parameters from input file
Dumux::Parameters::init(argc, argv, "test_gridcreator_cake.input");
Dumux::Parameters::init(argc, argv, "test_gridmanager_cake.input");
// make the grid
Dune::Timer timer;
......
......@@ -31,7 +31,7 @@ int main(int argc, char** argv) try
{
Dune::MPIHelper::instance(argc, argv);
Dumux::Parameters::init(argc, argv, "test_gridcreator_dgf_e_markers.input");
Dumux::Parameters::init(argc, argv, "test_gridmanager_dgf_e_markers.input");
auto name = Dumux::getParam<std::string>("Problem.Name");
Dumux::GridManagerTests<GRIDTYPE>::testElementMarkers("dgf", name);
......
......@@ -32,7 +32,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// initialize MPI, finalize is done automatically on exit
Dune::MPIHelper::instance(argc, argv);
Parameters::init(argc, argv, "test_gridcreator_gmsh_3d.input");
Parameters::init(argc, argv, "test_gridmanager_gmsh_3d.input");
const auto name = getParam<std::string>("Problem.Name");
const auto refine = Dumux::getParam<bool>("Grid.Refine", true);
GridManagerTests<GRIDTYPE>::testBoundaryAndElementMarkers("gmsh", name, refine);
......
......@@ -31,7 +31,7 @@ int main(int argc, char** argv) try
{
Dune::MPIHelper::instance(argc, argv);
Dumux::Parameters::init(argc, argv, "test_gridcreator_gmsh_e_markers.input");
Dumux::Parameters::init(argc, argv, "test_gridmanager_gmsh_e_markers.input");
auto name = Dumux::getParam<std::string>("Problem.Name");
Dumux::GridManagerTests<GRIDTYPE>::testElementMarkers("gmsh", name);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment