The TS-GitLab will have to shut down towards the end of the year — please think about migrating your projects to GitLab.com or GitHub.
(This is still a very early message, meant to keep you informed. There will be more urgent ones in the future.)

Commit a5519bdb authored by Lukas Riedel's avatar Lukas Riedel
Browse files

parallel reference tests now also test 3d cases

parent 1c1046f1
......@@ -8,12 +8,14 @@ ProcessorCount(num_proc)
set(num_proc_list "2")
if(num_proc GREATER 2)
# limit number of tests
if(num_proc GREATER 8)
set(num_proc 8)
if(num_proc GREATER 6)
set(num_proc 6)
endif()
foreach(n RANGE 3 ${num_proc})
set(num_proc_list "${num_proc_list}, ${n}")
endforeach()
else()
set(num_proc 2)
endif()
function(dorie_add_system_test target metaini)
......@@ -41,7 +43,7 @@ dorie_add_system_test(dorie reference_interpolators.mini)
if(num_proc GREATER 1)
dorie_add_system_test(dorie parallel_reference.mini)
dorie_add_system_test(dorie parallel_reference_compare.mini)
math(EXPR ptest_range "${num_proc} - 2")
math(EXPR ptest_range "(${num_proc} - 2) * 2")
foreach(n RANGE ${ptest_range})
dorie_add_system_test_dependency(dorie_parallel_reference_compare_000${n} dorie_parallel_reference)
endforeach()
......
......@@ -4,8 +4,10 @@ __name = parallel_reference
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
output.fileName = parallel_reference
output.outputPath = parallel_reference
_dimension = 2, 3 | expand dim
output.fileName = parallel_reference_{_dimension}
output.outputPath = parallel_reference_{_dimension}
output.verbose = 0
time.end = 1E5
......@@ -14,10 +16,13 @@ time.startTimestep = 1E3
adaptivity.useAdaptivity = false
grid.dimensions = {_dimension}
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 50 50
grid.extensions = 1 1
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
grid.cells = 40 40, 9 9 9 | expand dim
grid.extensions = 1 1, 1 1 1 | expand dim
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
parameters.arrayFile = "{_asset_path}/parfields/fft_2d_miller.h5"
\ No newline at end of file
parameters.arrayFile = "{_asset_path}/parfields/fft_2d_miller.h5", "{_asset_path}/parfields/fft_3d_miller.h5" | expand dim
parameters.scale = 1 1, 1 1 1 | expand dim
parameters.offset = 0 0, 0 0 0 | expand dim
\ No newline at end of file
......@@ -7,8 +7,10 @@ _test_command = run
_test_command_options = --parallel {_num_proc} -m=--allow-run-as-root
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = reference
_dimension = 2, 3 | expand dim
_reference.path = "${CMAKE_CURRENT_BINARY_DIR}/"
_reference.name = parallel_reference
_reference.name = parallel_reference_{_dimension}
output.fileName = parallel_reference_compare | unique
output.outputPath = parallel_reference_compare | unique
......@@ -20,10 +22,13 @@ time.startTimestep = 1E3
adaptivity.useAdaptivity = false
grid.dimensions = {_dimension}
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 50 50
grid.extensions = 1 1
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
grid.cells = 40 40, 9 9 9 | expand dim
grid.extensions = 1 1, 1 1 1 | expand dim
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
parameters.arrayFile = "{_asset_path}/parfields/fft_2d_miller.h5"
\ No newline at end of file
parameters.arrayFile = "{_asset_path}/parfields/fft_2d_miller.h5", "{_asset_path}/parfields/fft_3d_miller.h5" | expand dim
parameters.scale = 1 1, 1 1 1 | expand dim
parameters.offset = 0 0, 0 0 0 | expand dim
\ No newline at end of file
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