Merge branch 'feature/pm-ff-maxwellstefan' into 'master' (129bbe33) · Commits · dumux-repositories / dumux

Commit 129bbe33 authored 6 years ago by Timo Koch

Merge branch 'feature/pm-ff-maxwellstefan' into 'master'

Stokes-darcy coupling with maxwell stefan difusion

See merge request !1020

parents f220c93a 5b54140c

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh 4 additions, 4 deletions

dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh 30 additions, 31 deletions

dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
dumux/material/fluidsystems/brine.hh 5 additions, 0 deletions

dumux/material/fluidsystems/brine.hh
dumux/multidomain/boundary/stokesdarcy/couplingdata.hh 212 additions, 13 deletions

dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
dumux/porousmediumflow/1pnc/volumevariables.hh 16 additions, 6 deletions

dumux/porousmediumflow/1pnc/volumevariables.hh
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt 1 addition, 0 deletions

...multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt 29 additions, 0 deletions

...okesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc 299 additions, 0 deletions

...dary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/params.input 42 additions, 0 deletions

...stokesdarcy/1p2c_1p2c/diffusionlawcomparison/params.input
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh 281 additions, 0 deletions

...esdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh 322 additions, 0 deletions

...sdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt 14 additions, 0 deletions

...multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/h2n2co2fluidsystem.hh 155 additions, 0 deletions

...main/boundary/stokesdarcy/1p3c_1p3c/h2n2co2fluidsystem.hh
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc 279 additions, 0 deletions

test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/params.input 42 additions, 0 deletions

test/multidomain/boundary/stokesdarcy/1p3c_1p3c/params.input
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh 280 additions, 0 deletions

...ltidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh 305 additions, 0 deletions

...tidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
test/multidomain/boundary/stokesdarcy/CMakeLists.txt 1 addition, 0 deletions

test/multidomain/boundary/stokesdarcy/CMakeLists.txt
test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu 658 additions, 0 deletions

...ndary_darcy1p2c_stokes1p2c_comparison_darcy-reference.vtu
test/references/test_md_boundary_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu 760 additions, 0 deletions

...dary_darcy1p2c_stokes1p2c_comparison_stokes-reference.vtu

with 3735 additions and 54 deletions

Please register or to comment