From 9fc9bc204ec58bf1bd9239b882cece5093ff73a5 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 8 Feb 2012 18:47:07 +0000
Subject: [PATCH] CMake: copy parameter files, add them to the test command
 lines

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7679 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 CMakeLists.txt | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10581353dc..9f71ec163d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -341,13 +341,21 @@ add_subdirectory("tutorial")
 make_directory(bin)
 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)
@@ -373,14 +381,14 @@ 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 -gridFile test/boxmodels/1p/grids/test_1p_2d.dgf -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 -gridFile test/boxmodels/1p2c/grids/test_1p2c.dgf -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 -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 -gridFile test/boxmodels/2pni/grids/test_2pni.dgf -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 -gridFile test/boxmodels/2p2c/grids/test_2p2c.dgf -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 -gridFile test/boxmodels/2p2cni/grids/test_2p2cni.dgf -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 -gridFile test/boxmodels/MpNc/grids/obstacle_24x16.dgf -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 -gridFile test/boxmodels/richards/grids/richardslens-24x16.dgf -tEnd 3000 -dtInitial 100)
+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)
-- 
GitLab