Commit f646de09 authored by Santiago Ospina's avatar Santiago Ospina

modified the CI and updated the CMake

parent 996d36ae
......@@ -2,7 +2,7 @@
build-cmake/
# Exclude generated files
testing/*.mini
test/*.mini
python/parfield/wrapper/pf_from_file.py
python/testtools/wrapper/test_dorie.py
python/testtools/wrapper/test_dorie_pfg.py
......
......@@ -129,7 +129,7 @@ test:exec_cmds: &test
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/testing
- $CI_PROJECT_DIR/build-cmake/test
expire_in: 1 day
test:ode:
......
......@@ -49,7 +49,7 @@ add_subdirectory("lib")
add_subdirectory("python")
add_subdirectory("doc")
if(dune-testtools_FOUND)
add_subdirectory("testing")
add_subdirectory("test")
endif()
# finalize the dune project, e.g. generating config.h etc.
......
include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.ini
__name = mc
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_limit_cube_static = 4E-7
_limit_cube_adapt = 4E-7
_limit_simplex_static = 4E-7
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = ref_muphi
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = muphi
_reference.path = {_asset_path}/references/muphi/
_reference.meantol = 5E-3
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = ode_homogeneous_sand
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = ode
output.fileName = ode_homogeneous_sand | unique
......@@ -17,7 +17,7 @@ time.end = 1E7
time.maxTimestep = 1E7
time.startTimestep = 1E4
adaptivity.useAdaptivity = true
adaptivity.useAdaptivity = false
grid.FEorder = 1, 2, 3 | expand prec
grid.gridType = rectangular
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = ode_homogeneous_silt
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = ode
output.fileName = ode_homogeneous_silt | unique
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = ode_layered
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = ode
output.fileName = ode_layered | unique
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = ode_linear_interpolator
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = ode
output.fileName = ode_linear_interpolator | unique
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = parallel_reference
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_dimension = 2, 3 | expand dim
......
......@@ -5,11 +5,11 @@ _num_proc = 2, 3 | expand
__name = parallel_reference_compare
_test_command = run
_test_command_options = --parallel {_num_proc} -m=--allow-run-as-root
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_evaluation = reference
_dimension = 2, 3 | expand dim
_reference.path = "/home/saospina/Codes/DUNE_INSTALL/Debug/dorie/testing/"
_reference.path = "/home/saospina/Codes/DUNE_INSTALL/Debug/dorie/test/"
_reference.name = parallel_reference_{_dimension}
output.fileName = parallel_reference_compare | unique
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/parfield
__name = exec
_test_command = pfg
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
_data_path = {_asset_path}/parfield-data
_evaluation = reference
......
......@@ -2,7 +2,7 @@ include /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/doc/default_files/config.i
__name = exec_run
_test_command = run
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/testing"
_asset_path = "/home/saospina/Codes/DUNE_SRC/dorie/test"
output.fileName = run | unique name
output.outputPath = run | unique name
......@@ -22,6 +22,6 @@ grid.FEorder = 2
grid.extensions = 1 1
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/testing/csv.h5
parameters.arrayFile = /home/saospina/Codes/DUNE_INSTALL/Debug/dorie/test/csv.h5
Markdown is supported
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