From 98cc3ad8dbc9d0a68ba2661b61d6f4e13eda4490 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Fri, 10 Aug 2012 14:07:53 +0000 Subject: [PATCH] CMakeLists: adapt to naming conventions for parameters git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8835 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- CMakeLists.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0903d0c7e5..50d3c703f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,22 +430,22 @@ add_test(test_ncpflash test/material/ncpflash/test_ncpflash) add_test(test_pengrobinson test/material/pengrobinson/test_pengrobinson) add_test(test_tabulation test/material/tabulation/test_tabulation) -add_test(test_1p bin/runTest.sh references/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p -gridFile test/boxmodels/1p/grids/test_1p_2d.dgf -tEnd 1 -dtInitial 1) -add_test(test_1p2c bin/runTest.sh references/outflow-reference.vtu outflow-00010.vtu test/boxmodels/1p2c/test_1p2c -gridFile test/boxmodels/1p2c/grids/test_1p2c.dgf -tEnd 100 -dtInitial 1) -add_test(test_2p bin/runTest.sh references/lens-reference.vtu lens-00009.vtu test/boxmodels/2p/test_2p -gridFile test/boxmodels/2p/grids/test_2p.dgf -tEnd 3000 -dtInitial 250) -add_test(test_2pni bin/runTest.sh references/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni -tEnd 1e4 -dtInitial 250) -add_test(test_2p2c bin/runTest.sh references/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c -gridFile test/boxmodels/2p2c/grids/test_2p2c.dgf -tEnd 1e4 -dtInitial 250) -add_test(test_2p2cni bin/runTest.sh references/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni -gridFile test/boxmodels/2p2cni/grids/test_2p2cni.dgf -tEnd 1e4 -dtInitial 250) -add_test(test_3p3c bin/runTest.sh references/infiltration-reference.vtu infiltration-00024.vtu test/boxmodels/3p3c/test_3p3c -gridFile test/boxmodels/3p3c/grids/test_3p3c.dgf) +add_test(test_1p bin/runTest.sh references/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p -Grid.File test/boxmodels/1p/grids/test_1p_2d.dgf -TimeManager.TEnd 1 -TimeManager.DtInitial 1) +add_test(test_1p2c bin/runTest.sh references/outflow-reference.vtu outflow-00010.vtu test/boxmodels/1p2c/test_1p2c -Grid.File test/boxmodels/1p2c/grids/test_1p2c.dgf -TimeManager.TEnd 100 -TimeManager.DtInitial 1) +add_test(test_2p bin/runTest.sh references/lens-reference.vtu lens-00009.vtu test/boxmodels/2p/test_2p -Grid.File test/boxmodels/2p/grids/test_2p.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 250) +add_test(test_2pni bin/runTest.sh references/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250) +add_test(test_2p2c bin/runTest.sh references/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c -Grid.File test/boxmodels/2p2c/grids/test_2p2c.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250) +add_test(test_2p2cni bin/runTest.sh references/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni -Grid.File test/boxmodels/2p2cni/grids/test_2p2cni.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250) +add_test(test_3p3c bin/runTest.sh references/infiltration-reference.vtu infiltration-00024.vtu test/boxmodels/3p3c/test_3p3c -Grid.File test/boxmodels/3p3c/grids/test_3p3c.dgf) set_tests_properties(test_3p3c PROPERTIES TIMEOUT 3600) -add_test(test_3p3cni bin/runTest.sh references/kuevette3p3cni-reference.vtu kuevette3p3cni-00039.vtu test/boxmodels/3p3cni/test_3p3cni -gridFile test/boxmodels/3p3cni/grids/kuev_2p2cni.dgf) +add_test(test_3p3cni bin/runTest.sh references/kuevette3p3cni-reference.vtu kuevette3p3cni-00039.vtu test/boxmodels/3p3cni/test_3p3cni -Grid.File test/boxmodels/3p3cni/grids/kuev_2p2cni.dgf) set_tests_properties(test_3p3cni PROPERTIES TIMEOUT 3600) -add_test(test_mpnc bin/runTest.sh references/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/mpnc/test_mpnc -gridFile test/boxmodels/mpnc/grids/obstacle_24x16.dgf -tEnd 1e4 -dtInitial 250) -add_test(test_richards bin/runTest.sh references/richardslens-reference.vtu richardslens-00008.vtu test/boxmodels/richards/test_richards -gridFile test/boxmodels/richards/grids/richardslens-24x16.dgf -tEnd 3000 -dtInitial 100) +add_test(test_mpnc bin/runTest.sh references/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/mpnc/test_mpnc -Grid.File test/boxmodels/mpnc/grids/obstacle_24x16.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250) +add_test(test_richards bin/runTest.sh references/richardslens-reference.vtu richardslens-00008.vtu test/boxmodels/richards/test_richards -Grid.File test/boxmodels/richards/grids/richardslens-24x16.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 100) add_test(test_diffusion bin/runTest.sh references/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3) add_test(test_dec1p bin/runTest.sh references/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p) -add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport -gridFile test/decoupled/2p/grids/test_transport.dgf) +add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport -Grid.File test/decoupled/2p/grids/test_transport.dgf) add_test(test_impes bin/runTest.sh references/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes) add_test(test_impesadaptive bin/runTest.sh references/test_2padaptive-reference.vtu test_2padaptive-00007.vtu test/decoupled/2padaptive/test_impesadaptive) add_test(test_dec2p2c bin/runTest.sh references/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c) @@ -455,8 +455,8 @@ add_test(tutorial_coupled tutorial/tutorial_coupled) add_test(tutorial_decoupled tutorial/tutorial_decoupled) if(SUPERLU_FOUND) - add_test(test_stokes bin/runTest.sh references/stokes-reference.vtu stokes-00013.vtu test/freeflow/stokes/test_stokes -gridFile test/freeflow/stokes/grids/test_stokes.dgf) - add_test(test_stokes2c bin/runTest.sh references/stokes2c-reference.vtu stokes2c-00007.vtu test/freeflow/stokes2c/test_stokes2c -gridFile test/freeflow/stokes2c/grids/test_stokes2c.dgf) - add_test(test_stokes2cni bin/runTest.sh references/stokes2cni-reference.vtu stokes2cni-00008.vtu test/freeflow/stokes2cni/test_stokes2cni -gridFile test/freeflow/stokes2cni/grids/test_stokes2cni.dgf) - add_test(test_navierstokes bin/runTest.sh references/navierstokes-reference.vtu navierstokes-00008.vtu test/freeflow/navierstokes/test_navierstokes -gridFile test/freeflow/navierstokes/grids/test_navierstokes.dgf) + add_test(test_stokes bin/runTest.sh references/stokes-reference.vtu stokes-00013.vtu test/freeflow/stokes/test_stokes -Grid.File test/freeflow/stokes/grids/test_stokes.dgf) + add_test(test_stokes2c bin/runTest.sh references/stokes2c-reference.vtu stokes2c-00007.vtu test/freeflow/stokes2c/test_stokes2c -Grid.File test/freeflow/stokes2c/grids/test_stokes2c.dgf) + add_test(test_stokes2cni bin/runTest.sh references/stokes2cni-reference.vtu stokes2cni-00008.vtu test/freeflow/stokes2cni/test_stokes2cni -Grid.File test/freeflow/stokes2cni/grids/test_stokes2cni.dgf) + add_test(test_navierstokes bin/runTest.sh references/navierstokes-reference.vtu navierstokes-00008.vtu test/freeflow/navierstokes/test_navierstokes -Grid.File test/freeflow/navierstokes/grids/test_navierstokes.dgf) endif(SUPERLU_FOUND) -- GitLab