From e189503ae160abde32b2f826ae4de064d4382e8b Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 8 Feb 2012 23:18:05 +0000
Subject: [PATCH] CMake: It is not sufficient to provide the parameter file,
since the tests are started from the root build directory and the grids are
not found. Therefore, also the gridfile names are provided. Copied references
and parameters into corresponding folders.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7681 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
CMakeLists.txt | 104 +++++++++++++++++++++++++------------------------
1 file changed, 53 insertions(+), 51 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f71ec163d..4199dbe6ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,68 +339,70 @@ 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 test/boxmodels/1p/1ptest-reference.vtu DESTINATION test/boxmodels/1p)
-file(COPY test/boxmodels/1p/test_1p.input DESTINATION test/boxmodels/1p)
-file(COPY test/boxmodels/1p2c/tissue-reference.vtu DESTINATION test/boxmodels/1p2c)
-file(COPY test/boxmodels/1p2c/test_1p2c.input DESTINATION test/boxmodels/1p2c)
-file(COPY test/boxmodels/2p/lens-reference.vtu DESTINATION test/boxmodels/2p)
-file(COPY test/boxmodels/2p/test_2p.input DESTINATION test/boxmodels/2p)
-file(COPY test/boxmodels/2pni/injection2pni-reference.vtu DESTINATION test/boxmodels/2pni)
-file(COPY test/boxmodels/2pni/test_2pni.input DESTINATION test/boxmodels/2pni)
-file(COPY test/boxmodels/2p2c/injection-reference.vtu DESTINATION test/boxmodels/2p2c)
-file(COPY test/boxmodels/2p2c/test_2p2c.input DESTINATION test/boxmodels/2p2c)
-file(COPY test/boxmodels/2p2cni/waterair-reference.vtu DESTINATION test/boxmodels/2p2cni)
-file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION test/boxmodels/2p2cni)
-file(COPY test/boxmodels/MpNc/obstacle-reference.vtu DESTINATION test/boxmodels/MpNc)
-file(COPY test/boxmodels/MpNc/test_MpNc.input DESTINATION test/boxmodels/MpNc)
-file(COPY test/boxmodels/richards/richardslens-reference.vtu DESTINATION test/boxmodels/richards)
-file(COPY test/boxmodels/richards/test_richards.input DESTINATION test/boxmodels/richards)
-file(COPY test/decoupled/1p/diffusion-reference.vtu DESTINATION test/decoupled/1p)
-file(COPY test/decoupled/1p/test_1p-reference.vtu DESTINATION test/decoupled/1p)
-file(COPY test/decoupled/2p/test_transport-reference.vtu DESTINATION test/decoupled/2p)
-file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION test/decoupled/2p)
-file(COPY test/decoupled/2p2c/test_dec2p2c-reference.vtu DESTINATION test/decoupled/2p2c)
-file(COPY test/common/generalproblem/generallens_box-reference.vtu DESTINATION test/common/generalproblem)
-file(COPY test/common/generalproblem/generallens_decoupled-reference.vtu DESTINATION test/common/generalproblem)
+file(COPY test/boxmodels/1p/1ptest-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/1p/test_1p.input DESTINATION parameters)
+file(COPY test/boxmodels/1p2c/tissue-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/1p2c/test_1p2c.input DESTINATION parameters)
+file(COPY test/boxmodels/2p/lens-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/2p/test_2p.input DESTINATION parameters)
+file(COPY test/boxmodels/2pni/injection2pni-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/2pni/test_2pni.input DESTINATION parameters)
+file(COPY test/boxmodels/2p2c/injection-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/2p2c/test_2p2c.input DESTINATION parameters)
+file(COPY test/boxmodels/2p2cni/waterair-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION parameters)
+file(COPY test/boxmodels/MpNc/obstacle-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/MpNc/test_MpNc.input DESTINATION parameters)
+file(COPY test/boxmodels/richards/richardslens-reference.vtu DESTINATION references)
+file(COPY test/boxmodels/richards/test_richards.input DESTINATION parameters)
+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/2p/test_transport-reference.vtu DESTINATION references)
+file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION references)
+file(COPY test/decoupled/2p2c/test_dec2p2c-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)
if(SUPERLU_FOUND)
- file(COPY test/freeflow/stokes/stokes-reference.vtu DESTINATION test/freeflow/stokes)
- file(COPY test/freeflow/stokes2c/stokes2c-reference.vtu DESTINATION test/freeflow/stokes2c)
- file(COPY test/freeflow/stokes2cni/stokes2cni-reference.vtu DESTINATION test/freeflow/stokes2cni)
+ file(COPY test/freeflow/stokes/stokes-reference.vtu DESTINATION references)
+ file(COPY test/freeflow/stokes2c/stokes2c-reference.vtu DESTINATION references)
+ file(COPY test/freeflow/stokes2cni/stokes2cni-reference.vtu DESTINATION references)
endif(SUPERLU_FOUND)
# set up CTest
enable_testing()
include(CTest)
add_test(test_propertysystem test/common/propertysystem/test_propertysystem)
-add_test(test_general_box bin/runTest.sh test/common/generalproblem/generallens_box-reference.vtu generallens_box-00003.vtu test/common/generalproblem/test_generalproblem_2p --box 1e2 2e1)
-add_test(test_general_dec bin/runTest.sh test/common/generalproblem/generallens_decoupled-reference.vtu generallens_decoupled-00003.vtu test/common/generalproblem/test_generalproblem_2p --decoupled 1e2 2e1)
-add_test(test_spline test/common/spline/test_spline)
+add_test(test_general_box bin/runTest.sh references/generallens_box-reference.vtu generallens_box-00003.vtu test/common/generalproblem/test_generalproblem_2p --box 1e2 2e1)
+add_test(test_general_dec bin/runTest.sh references/generallens_decoupled-reference.vtu generallens_decoupled-00003.vtu test/common/generalproblem/test_generalproblem_2p --decoupled 1e2 2e1)
+add_test(test_spline test/common/spline/test_spline)
add_test(test_fluidsystems test/material/fluidsystems/test_fluidsystems)
-add_test(test_ncpflash test/material/ncpflash/test_ncpflash)
-add_test(test_tabulation test/material/tabulation/test_tabulation)
-
-add_test(test_1p bin/runTest.sh test/boxmodels/1p/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p --parameter-file=test/boxmodels/1p/test_1p.input -tEnd 1 -dtInitial 1)
-add_test(test_1p2c bin/runTest.sh test/boxmodels/1p2c/tissue-reference.vtu tissue-00003.vtu test/boxmodels/1p2c/test_1p2c --parameter-file=test/boxmodels/1p2c/test_1p2c.input -tEnd 2e3 -dtInitial 1e3)
-add_test(test_2p bin/runTest.sh test/boxmodels/2p/lens-reference.vtu lens-00010.vtu test/boxmodels/2p/test_2p --parameter-file=test/boxmodels/2p/test_2p.input -tEnd 3000 -dtInitial 250)
-add_test(test_2pni bin/runTest.sh test/boxmodels/2pni/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni --parameter-file=test/boxmodels/2pni/test_2pni.input -tEnd 1e4 -dtInitial 250)
-add_test(test_2p2c bin/runTest.sh test/boxmodels/2p2c/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c --parameter-file=test/boxmodels/2p2c/test_2p2c.input -tEnd 1e4 -dtInitial 250)
-add_test(test_2p2cni bin/runTest.sh test/boxmodels/2p2cni/waterair-reference.vtu waterair-00011.vtu test/boxmodels/2p2cni/test_2p2cni --parameter-file=test/boxmodels/2p2cni/test_2p2cni.input -tEnd 1e4 -dtInitial 250)
-add_test(test_MpNc bin/runTest.sh test/boxmodels/MpNc/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/MpNc/test_MpNc --parameter-file=test/boxmodels/MpNc/test_MpNc.input -tEnd 1e4 -dtInitial 250)
-add_test(test_richards bin/runTest.sh test/boxmodels/richards/richardslens-reference.vtu richardslens-00008.vtu test/boxmodels/richards/test_richards --parameter-file=test/boxmodels/richards/test_richards.input -tEnd 3000 -dtInitial 100)
-
-add_test(test_diffusion bin/runTest.sh test/decoupled/1p/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
-add_test(test_dec1p bin/runTest.sh test/decoupled/1p/test_1p-reference.vtu test_1p-00001.vtu test/decoupled/1p/test_dec1p 3)
-add_test(test_transport bin/runTest.sh test/decoupled/2p/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport test/decoupled/2p/grids/test_transport.dgf 1e4)
-add_test(test_impes bin/runTest.sh test/decoupled/2p/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes 1e7)
-add_test(test_dec2p2c bin/runTest.sh test/decoupled/2p2c/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c)
-
-add_test(tutorial_coupled tutorial/tutorial_coupled 1 1)
+add_test(test_ncpflash test/material/ncpflash/test_ncpflash)
+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/test_1p_2d.dgf -tEnd 1 -dtInitial 1)
+add_test(test_1p2c bin/runTest.sh references/tissue-reference.vtu tissue-00003.vtu test/boxmodels/1p2c/test_1p2c --parameter-file=parameters/test_1p2c.input -gridFile test/boxmodels/1p2c/test_1p2c.dgf -tEnd 2e3 -dtInitial 1e3)
+add_test(test_2p bin/runTest.sh references/lens-reference.vtu lens-00010.vtu test/boxmodels/2p/test_2p --parameter-file=parameters/test_2p.input -gridFile test/boxmodels/2p/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/test_2p2c.dgf -tEnd 1e4 -dtInitial 250)
+add_test(test_2p2cni bin/runTest.sh references/waterair-reference.vtu waterair-00011.vtu test/boxmodels/2p2cni/test_2p2cni --parameter-file=parameters/test_2p2cni.input -gridFile test/boxmodels/2p2cni/test_2p2cni.dgf -tEnd 1e4 -dtInitial 250)
+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/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/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 3)
+add_test(test_transport bin/runTest.sh references/test_transport-reference.vtu test_transport-00006.vtu test/decoupled/2p/test_transport test/decoupled/2p/grids/test_transport.dgf 1e4)
+add_test(test_impes bin/runTest.sh references/test_impes-reference.vtu test_impes-00013.vtu test/decoupled/2p/test_impes 1e7)
+add_test(test_dec2p2c bin/runTest.sh references/test_dec2p2c-reference.vtu test_dec2p2c-00021.vtu test/decoupled/2p2c/test_dec2p2c)
+
+add_test(tutorial_coupled tutorial/tutorial_coupled 1 1)
add_test(tutorial_decoupled tutorial/tutorial_decoupled 1)
if(SUPERLU_FOUND)
- add_test(test_stokes bin/runTest.sh test/freeflow/stokes/stokes-reference.vtu stokes-00006.vtu test/freeflow/stokes/test_stokes test/freeflow/stokes/grids/test_stokes.dgf 10 1)
- add_test(test_stokes2c bin/runTest.sh test/freeflow/stokes2c/stokes2c-reference.vtu stokes2c-00006.vtu test/freeflow/stokes2c/test_stokes2c test/freeflow/stokes2c/grids/test_stokes2c.dgf 10 1)
- add_test(test_stokes2cni bin/runTest.sh test/freeflow/stokes2cni/stokes2cni-reference.vtu stokes2cni-00006.vtu test/freeflow/stokes2cni/test_stokes2cni test/freeflow/stokes2cni/grids/test_stokes2cni.dgf 10 1)
+ add_test(test_stokes bin/runTest.sh references/stokes-reference.vtu stokes-00006.vtu test/freeflow/stokes/test_stokes test/freeflow/stokes/grids/test_stokes.dgf 10 1)
+ add_test(test_stokes2c bin/runTest.sh references/stokes2c-reference.vtu stokes2c-00006.vtu test/freeflow/stokes2c/test_stokes2c test/freeflow/stokes2c/grids/test_stokes2c.dgf 10 1)
+ add_test(test_stokes2cni bin/runTest.sh references/stokes2cni-reference.vtu stokes2cni-00006.vtu test/freeflow/stokes2cni/test_stokes2cni test/freeflow/stokes2cni/grids/test_stokes2cni.dgf 10 1)
endif(SUPERLU_FOUND)
--
GitLab