Merge branch 'feature/port-fluidmatrixinteraction-tests' into 'next' (9fb8b6fe) · Commits · dumux-repositories / dumux

Commit 9fb8b6fe authored 8 years ago by Timo Koch

Merge branch 'feature/port-fluidmatrixinteraction-tests' into 'next'

[material] Port fluidmatrixinterac test and johansen thermalcond law

See merge request !353

parents 91f9f622 213f881b

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh 9 additions, 9 deletions

...fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh 6 additions, 6 deletions

...fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
test/material/fluidmatrixinteractions/2p/CMakeLists.txt 1 addition, 3 deletions

test/material/fluidmatrixinteractions/2p/CMakeLists.txt
test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.cc 17 additions, 3 deletions

...matrixinteractions/2p/test_thermalconductivityjohansen.cc
test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.input 4 additions, 1 deletion

...rixinteractions/2p/test_thermalconductivityjohansen.input
test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.cc 17 additions, 3 deletions

...matrixinteractions/2p/test_thermalconductivitysomerton.cc
test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.input 4 additions, 1 deletion

...rixinteractions/2p/test_thermalconductivitysomerton.input
test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh 0 additions, 222 deletions

...trixinteractions/2p/thermalconductivityjohansenproblem.hh
test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh 0 additions, 222 deletions

...trixinteractions/2p/thermalconductivitysomertonproblem.hh
test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh 16 additions, 164 deletions

...matrixinteractions/2p/thermalconductivityspatialparams.hh
test/material/fluidmatrixinteractions/CMakeLists.txt 4 additions, 3 deletions

test/material/fluidmatrixinteractions/CMakeLists.txt
test/material/fluidmatrixinteractions/diffusivityspatialparams.hh 64 additions, 0 deletions

...erial/fluidmatrixinteractions/diffusivityspatialparams.hh
test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh 0 additions, 222 deletions

...rixinteractions/effectivediffusivityconstanttauproblem.hh
test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh 0 additions, 222 deletions

...nteractions/effectivediffusivitymillingtonquirkproblem.hh
test/material/fluidmatrixinteractions/fluidmatrixinteractionsspatialparams.hh 134 additions, 0 deletions

...atrixinteractions/fluidmatrixinteractionsspatialparams.hh
test/material/fluidmatrixinteractions/test_effectivediffusivityconstant.cc 16 additions, 2 deletions

...idmatrixinteractions/test_effectivediffusivityconstant.cc
test/material/fluidmatrixinteractions/test_effectivediffusivityconstant.input 4 additions, 1 deletion

...atrixinteractions/test_effectivediffusivityconstant.input
test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.cc 15 additions, 3 deletions

...atrixinteractions/test_effectivediffusivityconstanttau.cc
test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.input 4 additions, 1 deletion

...ixinteractions/test_effectivediffusivityconstanttau.input
test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.cc 15 additions, 3 deletions

...xinteractions/test_effectivediffusivitymillingtonquirk.cc

with 330 additions and 1091 deletions

Please register or to comment