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 c9c3c011 authored by Lukas Riedel's avatar Lukas Riedel
Browse files

Squash ODE testing for homogeneous and layered media

* reduce number and runtime of ODE tests
* use layered parfield from dorie-pub benchmarks
* choose tight residual error limits
* disable all other tests for now
parent 536610da
......@@ -10,40 +10,36 @@ function(dorie_add_system_test_dependency test1 test2)
endfunction()
# dorie run
dorie_add_system_test(dorie ode_homogeneous_1.mini)
dorie_add_system_test(dorie ode_homogeneous_2.mini)
dorie_add_system_test(dorie ode_homogeneous_3.mini)
dorie_add_system_test(dorie ode_heterogeneous_1.mini)
dorie_add_system_test(dorie ode_heterogeneous_2.mini)
dorie_add_system_test(dorie ode_heterogeneous_3.mini)
dorie_add_system_test(dorie ode_evaporation.mini)
dorie_add_system_test(dorie ode_linear_interpolator.mini)
dorie_add_system_test(dorie muphi.mini)
dorie_add_system_test_dependency(dorie_muphi dorie-rfg_muphi_pfg)
dorie_add_system_test(dorie reference_2d.mini)
dorie_add_system_test(dorie reference_3d.mini)
dorie_add_system_test(dorie reference_evaporation.mini)
dorie_add_system_test(dorie reference_interpolators.mini)
# dorie in parallel
dorie_add_system_test(dorie parallel_reference.mini)
dorie_add_system_test(dorie parallel_reference_compare.mini)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0000 dorie_parallel_reference_0000)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0001 dorie_parallel_reference_0000)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0002 dorie_parallel_reference_0001)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0003 dorie_parallel_reference_0001)
# dorie pfg
dorie_add_system_test(dorie-rfg parfield.mini)
dorie_add_system_test(dorie-rfg parfield_muphi.mini)
dorie_add_system_test(dorie-rfg correlation.mini)
dorie_add_system_test(dorie-rfg correlation_parallel.mini)
# dorie plot
dorie_add_system_test(dorie plot.mini)
dorie_add_system_test_dependency(dorie_plot dorie_reference_2d_0000)
# dorie create
dorie_add_system_test(dorie create.mini)
dorie_add_system_test(dorie ode_homogeneous_sand.mini)
dorie_add_system_test(dorie ode_homogeneous_silt.mini)
dorie_add_system_test(dorie ode_layered.mini)
# dorie_add_system_test(dorie ode_evaporation.mini)
# dorie_add_system_test(dorie ode_linear_interpolator.mini)
# dorie_add_system_test(dorie muphi.mini)
# dorie_add_system_test_dependency(dorie_muphi dorie-rfg_muphi_pfg)
# dorie_add_system_test(dorie reference_2d.mini)
# dorie_add_system_test(dorie reference_3d.mini)
# dorie_add_system_test(dorie reference_evaporation.mini)
# dorie_add_system_test(dorie reference_interpolators.mini)
# # dorie in parallel
# dorie_add_system_test(dorie parallel_reference.mini)
# dorie_add_system_test(dorie parallel_reference_compare.mini)
# dorie_add_system_test_dependency(dorie_parallel_reference_compare_0000 dorie_parallel_reference_0000)
# dorie_add_system_test_dependency(dorie_parallel_reference_compare_0001 dorie_parallel_reference_0000)
# dorie_add_system_test_dependency(dorie_parallel_reference_compare_0002 dorie_parallel_reference_0001)
# dorie_add_system_test_dependency(dorie_parallel_reference_compare_0003 dorie_parallel_reference_0001)
# # dorie pfg
# dorie_add_system_test(dorie-rfg parfield.mini)
# dorie_add_system_test(dorie-rfg parfield_muphi.mini)
# dorie_add_system_test(dorie-rfg correlation.mini)
# dorie_add_system_test(dorie-rfg correlation_parallel.mini)
# # dorie plot
# dorie_add_system_test(dorie plot.mini)
# dorie_add_system_test_dependency(dorie_plot dorie_reference_2d_0000)
# # dorie create
# dorie_add_system_test(dorie create.mini)
\ No newline at end of file
# BC DATA FILE 2D - Author: L. Riedel - 2015-08-27
#
# Specify intersection coordinates of segments. First, state the number n of coordinates you will place.
# Beginning and end of borders will be added automatically. Thus, every side will have n+1 segments.
# State "-1" to apply a Neumann boundary of flux j=0 to one entire border ("No flow boundary").
# For No Flow Boundaries no BCs have to be stated.
# 3 Segments: 0: 0.0 <-> 0.4 ; 1: 0.4 <-> 0.8 ; 2: 0.8 <-> width
spatial_resolution_north 0
# 1 Segment: 0: 0.0 <-> width
spatial_resolution_south 0
# 1 Segment with no flow BC: 0: 0.0 <-> height
spatial_resolution_west -1
spatial_resolution_east -1
# number of times at which BCs are defined.
number_BC_change_times 1
# Definition of BCs. Order of boundaries as above. Boundary numeration runs along respective standard basis vector.
# If you want the BC type to change and you have set "boundary.interpolateBCvalues = true", you will have to state the same time stamp twice and change BC type in between.
0 neumann -3e-6 dirichlet 0
0 neumann -5.55e-6 dirichlet 0
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_heterogeneous_3
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_3 | unique
output.outputPath = ode_homogeneous_3 | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/layered.h5"
time.end = 1E7
time.maxTimestep = 1E7
time.startTimestep = 1E4
adaptivity.useAdaptivity = false
grid.FEorder = 3
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 10, 1 160 | expand prec
[_ode]
flux = -3e-6
head_abstol = 3E-4, 2E-5 | expand prec
flux_abstol = 2E-8, 4E-9 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_homogeneous_2
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_2 | unique
output.outputPath = ode_homogeneous_2 | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/sand.h5"
time.end = 1E7
time.maxTimestep = 1E7
time.startTimestep = 1E4
grid.FEorder = 2
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 5, 1 40 | expand prec
[_ode]
flux = -3e-6
head_abstol = 7E-5, 3E-8 | expand prec
flux_abstol = 6E-8, 9E-10 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_homogeneous_3
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_3 | unique
output.outputPath = ode_homogeneous_3 | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/sand.h5"
time.end = 1E7
time.maxTimestep = 1E7
time.startTimestep = 1E4
grid.FEorder = 3
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 5, 1 40 | expand prec
[_ode]
flux = -3e-6
head_abstol = 2E-5, 2E-8 | expand prec
flux_abstol = 7E-10, 3E-13 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_homogeneous_1
__name = ode_homogeneous_sand
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_1 | unique
output.outputPath = ode_homogeneous_1 | unique
output.fileName = ode_homogeneous_sand | unique
output.outputPath = ode_homogeneous_sand | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
......@@ -19,16 +19,19 @@ time.startTimestep = 1E4
adaptivity.useAdaptivity = false
grid.FEorder = 1
grid.FEorder = 1, 2, 3 | expand prec
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 10, 1 640 | expand prec
grid.cells = 1 160, 1 40, 1 20 | expand prec
[_ode]
flux = -3e-6
head_abstol = 6E-4, 2E-7 | expand prec
flux_abstol = 2E-8, 3E-12 | expand prec
flux = -5.55e-6
head_abstol = 3E-6, 2E-8, 6E-8 | expand prec
flux_abstol = 5E-11, 1E-9, 3E-12 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
Reduction = 1E-10
[dg]
penaltyFactor = 10
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_heterogeneous_2
__name = ode_homogeneous_silt
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_2 | unique
output.outputPath = ode_homogeneous_2 | unique
output.fileName = ode_homogeneous_silt | unique
output.outputPath = ode_homogeneous_silt | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/layered.h5"
parameters.arrayFile = "{_asset_path}/parfields/silt.h5"
time.end = 1E7
time.maxTimestep = 1E7
......@@ -19,16 +19,19 @@ time.startTimestep = 1E4
adaptivity.useAdaptivity = false
grid.FEorder = 2
grid.FEorder = 1, 2, 3 | expand prec
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 10, 1 320 | expand prec
grid.cells = 1 160, 1 40, 1 20 | expand prec
[_ode]
flux = -3e-6
head_abstol = 6E-4, 2E-5 | expand prec
flux_abstol = 4E-8, 4E-9 | expand prec
flux = -5.55e-6
head_abstol = 6E-6, 4E-6, 9E-6 | expand prec
flux_abstol = 2E-9, 2E-8, 3E-9 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
Reduction = 1E-10
[dg]
penaltyFactor = 10
\ No newline at end of file
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = ode_heterogeneous_1
__name = ode_layered
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
output.fileName = ode_homogeneous_1 | unique
output.outputPath = ode_homogeneous_1 | unique
output.fileName = ode_layered | unique
output.outputPath = ode_layered | unique
output.verbose = 0
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
......@@ -19,16 +19,19 @@ time.startTimestep = 1E4
adaptivity.useAdaptivity = false
grid.FEorder = 1
grid.FEorder = 1, 2, 3 | expand prec
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 10, 1 640 | expand prec
grid.cells = 1 160, 1 40, 1 20 | expand prec
[_ode]
flux = -3e-6
head_abstol = 2E-3, 3E-5 | expand prec
flux_abstol = 6E-8, 7E-9 | expand prec
flux = -5.55e-6
head_abstol = 2E-5, 2E-5, 2E-5 | expand prec
flux_abstol = 4E-9, 4E-9, 3E-9 | expand prec
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
\ No newline at end of file
Reduction = 1E-10
[dg]
penaltyFactor = 10
\ 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