Commit 5615aac5 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[test] Ignore whitespaces in reference solution

parent 52a76670
Pipeline #13002 passed with stages
in 7 minutes and 47 seconds
......@@ -46,6 +46,10 @@ build-tests:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *build-tests
build-tests:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0
<<: *build-tests
build-tests:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
......@@ -78,6 +82,12 @@ test-partitioned:3.4-2.2.1:
needs:
- build-tests:3.4-2.2.1
test-partitioned:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0
<<: *test-partitioned-cases
needs:
- build-tests:3.4-2.3.0
test-partitioned:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-partitioned-cases
......@@ -112,6 +122,12 @@ test-monolithic:3.4-2.2.1:
needs:
- build-tests:3.4-2.2.1
test-monolithic:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0
<<: *test-monolithic-cases
needs:
- build-tests:3.4-2.3.0
test-monolithic:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-cases
......
......@@ -2,6 +2,7 @@
## Not released yet
- 2022-01-31: We now use `diff -w` to compare preCICE's output files for regression tests. In preCICE 2.3.0 the white spaces used have changed which broke our regressions tests.
- 2022-01-26: Renamed `dumupreciceindexwrapper.[hh|cc]` to `dumupreciceindexmapper.[hh|cc]` to be consistent with the class name.
- 2022-01-26: Made sure all private member of the adapter are prefixed with an underscore.
- 2022-01-26: Add and configure Doxygen code documentation of coupling adapter.
......
......@@ -75,12 +75,12 @@ parser.add_argument(
help="Name of the preCICE iteration file names to be compared (required)",
required=True,
)
#parser.add_argument(
# parser.add_argument(
# "--path-to-executables",
# type=str,
# help="Path where to find the executables (required)",
# required=True,
#)
# )
args = vars(parser.parse_args())
print(args)
......@@ -112,14 +112,14 @@ def diff_iteration_files(diff_file_name, file_names):
with open(diff_file_name, "w") as f:
proc = sp.Popen(
["diff", file_names[0], file_names[1]],
["diff", "-w", file_names[0], file_names[1]],
stdout=f,
stderr=f,
)
proc.wait()
with open(diff_file_name, 'r') as fin:
print( "File diff:\n {}".format(fin.read()) )
with open(diff_file_name, "r") as fin:
print("File diff:\n {}".format(fin.read()))
return_code = proc.returncode
......@@ -138,10 +138,14 @@ except:
# Start thread for Biot solver in background
ff_proc, ff_output = run_solver(
"./test_ff_flow_over_square_2d", args["dumux_param_file"], args["precice_config_file"]
"./test_ff_flow_over_square_2d",
args["dumux_param_file"],
args["precice_config_file"],
)
pm_proc, pm_output = run_solver(
"./test_pm_flow_over_square_2d", args["dumux_param_file"], args["precice_config_file"]
"./test_pm_flow_over_square_2d",
args["dumux_param_file"],
args["precice_config_file"],
)
# Wait for solvers to finish
......
Supports Markdown
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