Commit ed1b3872 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'fix/facet-1p-convtest-parallel' into 'master'

Fix/facet 1p convtest parallel

Closes #638

See merge request !1445

(cherry picked from commit bec8d3f4)

dc1dc29c [test][facet][1pconvergence] use executable-specifig grid file names
1d60b52c [test][facet][1pconvergence] remove obsolete restriction on input arguments
parent e66c2a35
......@@ -5,10 +5,10 @@ import os.path
import subprocess
import sys
if len(sys.argv) > 5 or len(sys.argv) < 3:
if len(sys.argv) < 3:
sys.stderr.write("Invalid number of arguments given. Please provide the following arguments (in this order):\n\
- the name of the executable (either test_facetcoupling_tpfa_1p1p or test_facetcoupling_box_1p1p)\n\
- between one and three fracture permeabilities you want to consider")
- the fracture permeabilities you want to perform the convergence test for")
# name of the executable
......@@ -41,7 +41,7 @@ for permIndex in range(0, len(k)):
# write a temporary geo-file using num elements
tmpGeoFile = open("grids/tmp.geo", 'w')
tmpGeoFile = open("grids/" + execName + ".geo", 'w')
lines[0] = "numElemsPerSide = " + str(int(cells)) + ";\n"
for line in lines:
......@@ -49,17 +49,17 @@ for permIndex in range(0, len(k)):
tmpGeoFile.close()['gmsh', '-2', 'grids/tmp.geo'])['gmsh', '-2', "grids/" + execName + ".geo"])['./' + execName, 'params.input',
'-Vtk.OutputName', execName,
'-Grid.File', 'grids/tmp.msh',
'-Grid.File', "grids/" + execName + ".msh",
'-Grid.NumElemsPerSide', str(int(cells)),
'-LowDim.SpatialParams.Permeability', str(k[permIndex]),
'-Problem.OutputFileName', execName + '.log'])
# remove geo and msh file['rm', 'grids/tmp.geo'])['rm', 'grids/tmp.msh'])['rm', "grids/" + execName + ".geo"])['rm', "grids/" + execName + ".msh"])
# check the rates and append them to the log file
logfile = open(execName + '.log', "r+")
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