diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895dae89a692e0a2dba9883133f00250f98db1d4..0903d0c7e5d1e12839c9a956a47447e0cec0e865 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,54 +367,53 @@ add_subdirectory("tutorial")
# copy the testing script
make_directory(bin)
make_directory(references)
-make_directory(parameters)
file(COPY bin/runTest.sh DESTINATION bin)
file(COPY bin/fuzzycomparevtu.py DESTINATION bin)
file(COPY test/boxmodels/1p/1ptest-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/1p/test_1p.input DESTINATION parameters)
+file(COPY test/boxmodels/1p/test_1p.input DESTINATION test/boxmodels/1p)
file(COPY test/boxmodels/1p2c/outflow-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/1p2c/test_1p2c.input DESTINATION parameters)
+file(COPY test/boxmodels/1p2c/test_1p2c.input DESTINATION test/boxmodels/1p2c)
file(COPY test/boxmodels/2p/lens-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/2p/test_2p.input DESTINATION parameters)
+file(COPY test/boxmodels/2p/test_2p.input DESTINATION test/boxmodels/2p)
file(COPY test/boxmodels/2pni/injection2pni-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/2pni/test_2pni.input DESTINATION parameters)
+file(COPY test/boxmodels/2pni/test_2pni.input DESTINATION test/boxmodels/2pni)
file(COPY test/boxmodels/2p2c/injection-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/2p2c/test_2p2c.input DESTINATION parameters)
+file(COPY test/boxmodels/2p2c/test_2p2c.input DESTINATION test/boxmodels/2p2c)
file(COPY test/boxmodels/2p2cni/waterair-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION parameters)
+file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION test/boxmodels/2p2cni)
file(COPY test/boxmodels/3p3c/infiltration-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/3p3c/test_3p3c.input DESTINATION parameters)
+file(COPY test/boxmodels/3p3c/test_3p3c.input DESTINATION test/boxmodels/3p3c)
file(COPY test/boxmodels/3p3cni/kuevette3p3cni-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/3p3cni/test_3p3cni.input DESTINATION parameters)
+file(COPY test/boxmodels/3p3cni/test_3p3cni.input DESTINATION test/boxmodels/3p3cni)
file(COPY test/boxmodels/mpnc/obstacle-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/mpnc/test_mpnc.input DESTINATION parameters)
+file(COPY test/boxmodels/mpnc/test_mpnc.input DESTINATION test/boxmodels/mpnc)
file(COPY test/boxmodels/richards/richardslens-reference.vtu DESTINATION references)
-file(COPY test/boxmodels/richards/test_richards.input DESTINATION parameters)
+file(COPY test/boxmodels/richards/test_richards.input DESTINATION test/boxmodels/richards)
file(COPY test/decoupled/1p/diffusion-reference.vtu DESTINATION references)
file(COPY test/decoupled/1p/test_1p-reference.vtu DESTINATION references)
file(COPY test/decoupled/1p/test_1p.input DESTINATION test/decoupled/1p/)
file(COPY test/decoupled/2p/test_transport-reference.vtu DESTINATION references)
-file(COPY test/decoupled/2p/test_transport.input DESTINATION parameters)
+file(COPY test/decoupled/2p/test_transport.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION references)
-file(COPY test/decoupled/2p/test_impes.input DESTINATION parameters)
+file(COPY test/decoupled/2p/test_impes.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2padaptive/test_2padaptive-reference.vtu DESTINATION references)
-file(COPY test/decoupled/2padaptive/test_impesadaptive.input DESTINATION parameters)
+file(COPY test/decoupled/2padaptive/test_impesadaptive.input DESTINATION test/decoupled/2padaptive)
file(COPY test/decoupled/2p2c/test_dec2p2c-reference.vtu DESTINATION references)
-file(COPY test/decoupled/2p2c/test_dec2p2c.input DESTINATION parameters)
+file(COPY test/decoupled/2p2c/test_dec2p2c.input DESTINATION test/decoupled/2p2c)
file(COPY test/decoupled/2p2c/test_multiphysics2p2c-reference.vtu DESTINATION references)
file(COPY test/common/generalproblem/generallens_box-reference.vtu DESTINATION references)
file(COPY test/common/generalproblem/generallens_decoupled-reference.vtu DESTINATION references)
-file(COPY tutorial/tutorial_coupled.input DESTINATION parameters)
-file(COPY tutorial/tutorial_decoupled.input DESTINATION parameters)
+file(COPY tutorial/tutorial_coupled.input DESTINATION tutorial)
+file(COPY tutorial/tutorial_decoupled.input DESTINATION tutorial)
if(SUPERLU_FOUND)
file(COPY test/freeflow/stokes/stokes-reference.vtu DESTINATION references)
- file(COPY test/freeflow/stokes/test_stokes.input DESTINATION parameters)
+ file(COPY test/freeflow/stokes/test_stokes.input DESTINATION test/freeflow/stokes)
file(COPY test/freeflow/stokes2c/stokes2c-reference.vtu DESTINATION references)
- file(COPY test/freeflow/stokes2c/test_stokes2c.input DESTINATION parameters)
+ file(COPY test/freeflow/stokes2c/test_stokes2c.input DESTINATION test/freeflow/stokes2c)
file(COPY test/freeflow/stokes2cni/stokes2cni-reference.vtu DESTINATION references)
- file(COPY test/freeflow/stokes2cni/test_stokes2cni.input DESTINATION parameters)
+ file(COPY test/freeflow/stokes2cni/test_stokes2cni.input DESTINATION test/freeflow/stokes2cni)
file(COPY test/freeflow/navierstokes/navierstokes-reference.vtu DESTINATION references)
- file(COPY test/freeflow/navierstokes/test_navierstokes.input DESTINATION parameters)
+ file(COPY test/freeflow/navierstokes/test_navierstokes.input DESTINATION test/freeflow/navierstokes)
endif(SUPERLU_FOUND)
# set up CTest
@@ -431,33 +430,33 @@ 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 --parameter-file=parameters/test_1p.input -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 --parameter-file=parameters/test_1p2c.input -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 --parameter-file=parameters/test_2p.input -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 --parameter-file=parameters/test_2pni.input -tEnd 1e4 -dtInitial 250)
-add_test(test_2p2c bin/runTest.sh references/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c --parameter-file=parameters/test_2p2c.input -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 --parameter-file=parameters/test_2p2cni.input -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 --parameter-file=parameters/test_3p3c.input -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 -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)
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 --parameter-file=parameters/test_3p3cni.input -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 -gridFile 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 --parameter-file=parameters/test_mpnc.input -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 --parameter-file=parameters/test_richards.input -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 -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_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 --parameter-file=test/decoupled/1p/test_1p.input)
-add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport --parameter-file=parameters/test_transport.input -gridFile 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 --parameter-file=parameters/test_impes.input)
-add_test(test_impesadaptive bin/runTest.sh references/test_2padaptive-reference.vtu test_2padaptive-00007.vtu test/decoupled/2padaptive/test_impesadaptive --parameter-file=parameters/test_impesadaptive.input)
-add_test(test_dec2p2c bin/runTest.sh references/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c --parameter-file=parameters/test_dec2p2c.input)
-add_test(test_multiphysics2p2c bin/runTest.sh references/test_multiphysics2p2c-reference.vtu test_multiphysics2p2c-00021.vtu test/decoupled/2p2c/test_multiphysics2p2c)
+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_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)
+add_test(test_multiphysics2p2c bin/runTest.sh references/test_multiphysics2p2c-reference.vtu test_multiphysics2p2c-00021.vtu test/decoupled/2p2c/test_multiphysics2p2c)
-add_test(tutorial_coupled tutorial/tutorial_coupled --parameter-file=parameters/tutorial_coupled.input)
-add_test(tutorial_decoupled tutorial/tutorial_decoupled --parameter-file=parameters/tutorial_decoupled.input)
+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 --parameter-file=parameters/test_stokes.input -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 --parameter-file=parameters/test_stokes2c.input -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 --parameter-file=parameters/test_stokes2cni.input -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 --parameter-file=parameters/test_navierstokes.input -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 -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)
endif(SUPERLU_FOUND)