Commit ecf4fbd1 authored by Lukas Riedel's avatar Lukas Riedel

Adapt system test mini files to new mapping keys

parent 4a3785eb
......@@ -12,19 +12,19 @@ _suffix = _static, _adapt | expand adaptive
limit = {_limit{_prefix}{_suffix}}
adaptivity.policy = none, waterFlux | expand adaptive
adaptivity.maxLevel = 3
adaptivity.markingStrategy = threshold
adaptivity.refinementFraction = 5E-9
adaptivity.coarseningFraction = 5E-10
adaptivity.threshold = 0.0
grid.gridType = gmsh, rectangular | expand grid
grid.initialLevel = 2
grid.cells = 20 20
grid.gridFile = {_asset_path}/meshes/square.msh
grid.mappingFile = None
grid.globalIndex = 0
[adaptivity]
policy = none, waterFlux | expand adaptive
maxLevel = 3
markingStrategy = threshold
refinementFraction = 5E-9
coarseningFraction = 5E-10
threshold = 0.0
[grid]
gridType = gmsh, rectangular | expand grid
initialLevel = 2
cells = 20 20
gridFile = {_asset_path}/meshes/square.msh
[richards]
......
......@@ -7,13 +7,16 @@ _evaluation = muphi
_reference.path = {_asset_path}/references/muphi/
_reference.meantol = 7.6E-3
grid.dimensions = 2
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 64 64
grid.extensions = 1 1
grid.mappingFile = "{_asset_path}/maps/muphi.h5"
grid.mappingFileDataset = field
[grid]
dimensions = 2
initialLevel = 0
gridType = rectangular
cells = 64 64
extensions = 1 1
[grid.mapping]
file = "{_asset_path}/maps/muphi.h5"
dataset = field
[richards]
......
......@@ -5,11 +5,10 @@ _test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 160, 1 40, 1 20 | expand prec
grid.mappingFile = none
grid.globalIndex = 0
[grid]
gridType = rectangular
initialLevel = 0
cells = 1 160, 1 40, 1 20 | expand prec
[richards]
......
......@@ -5,11 +5,14 @@ _test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 160, 1 40, 1 20 | expand prec
grid.mappingFile = none
grid.globalIndex = 1
[grid]
gridType = rectangular
initialLevel = 0
cells = 1 160, 1 40, 1 20 | expand prec
[grid.mapping]
file = none
volume = 1
[richards]
......@@ -34,4 +37,4 @@ numerics.FEorder = 1, 2, 3 | 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
\ No newline at end of file
flux_abstol = 2E-9, 2E-8, 3E-9 | expand prec
......@@ -5,11 +5,14 @@ _test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_evaluation = ode
grid.gridType = rectangular
grid.initialLevel = 0
grid.cells = 1 160, 1 40, 1 20 | expand prec
grid.mappingFile = "{_asset_path}/maps/cell_ids.h5"
grid.mappingFileDataset = ode_layered_160, ode_layered_40, ode_layered_20 | expand prec
[grid]
gridType = rectangular
initialLevel = 0
cells = 1 160, 1 40, 1 20 | expand prec
[grid.mapping]
file = "{_asset_path}/maps/cell_ids.h5"
volume = ode_layered_160, ode_layered_40, ode_layered_20 | expand prec
[richards]
......
......@@ -4,12 +4,15 @@ __name = parallel_reference
_test_command = run
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 40 40
grid.extensions = 1 1
grid.mappingFile = "{_asset_path}/maps/cell_ids.h5"
grid.mappingFileDataset = parallel_reference_2d
[grid]
initialLevel = 0
gridType = rectangular
cells = 40 40
extensions = 1 1
[grid.mapping]
file = "{_asset_path}/maps/cell_ids.h5"
volume = parallel_reference_2d
[richards]
......@@ -23,4 +26,4 @@ parameters.file = "{_asset_path}/param/param.yml"
time.end = 1E5
time.maxTimestep = 1E5
time.startTimestep = 1E3
\ No newline at end of file
time.startTimestep = 1E3
......@@ -13,13 +13,16 @@ _reltol = 1E-6
_reference.path = "${CMAKE_CURRENT_BINARY_DIR}"
_reference.name = parallel_reference
grid.dimensions = 2
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 40 40
grid.extensions = 1 1
grid.mappingFile = "{_asset_path}/maps/cell_ids.h5"
grid.mappingFileDataset = parallel_reference_2d
[grid]
dimensions = 2
initialLevel = 0
gridType = rectangular
cells = 40 40
extensions = 1 1
[grid.mapping]
file = "{_asset_path}/maps/cell_ids.h5"
volume = parallel_reference_2d
[richards]
......@@ -33,4 +36,3 @@ parameters.file = "{_asset_path}/param/param.yml"
time.end = 1E5
time.maxTimestep = 1E5
time.startTimestep = 1E3
......@@ -9,8 +9,6 @@ grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 20 20
grid.extensions = 1 1
grid.mappingFile = None
grid.globalIndex = 0
[richards]
......@@ -25,4 +23,4 @@ time.end = 1E4
time.maxTimestep = 1E4
time.startTimestep = 5E2
numerics.FEorder = 2
\ No newline at end of file
numerics.FEorder = 2
......@@ -9,9 +9,6 @@ grid.dimensions = 2, 3 | expand dim
grid.gridType = rectangular
grid.extensions = 1 1, 1 1 1 | expand dim
grid.cells = 40 40, 15 15 15 | expand dim
grid.initialLevel = 0
grid.mappingFile = none
grid.globalIndex = 0
adaptivity.useAdaptivity = false
......@@ -30,4 +27,4 @@ time.maxTimestep = 1E7
time.startTimestep = 1E4
numerics.timestepMethod = explicit_euler, implicit_euler | expand solver
numerics.courant = 0.1, 0.7 | expand diff
\ No newline at end of file
numerics.courant = 0.1, 0.7 | expand diff
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