Merge branch 'feature/wetting-phase' into 'master' (7d3239ae) · Commits · dumux-repositories / dumux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

dumux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7d3239ae

Commit 7d3239ae authored 4 years ago by Timo Koch

Downloads
- Plain Diff

Merge branch 'feature/wetting-phase' into 'master'

Cleanup/wetting-phase-index

Closes #834

See merge request !1918

parents 8a2fd7d7 717c9e2a

No related branches found

No related tags found

1 merge request!1918Cleanup/wetting-phase-index

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

dumux/io/plotthermalconductivitymodel.hh 5 additions, 5 deletions

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

...fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
dumux/material/fluidstates/compositional.hh 2 additions, 4 deletions

dumux/material/fluidstates/compositional.hh
dumux/material/fluidstates/immiscible.hh 14 additions, 0 deletions

dumux/material/fluidstates/immiscible.hh
dumux/material/fluidstates/isothermalimmiscible.hh 14 additions, 0 deletions

dumux/material/fluidstates/isothermalimmiscible.hh
dumux/porousmediumflow/2p/volumevariables.hh 16 additions, 15 deletions

dumux/porousmediumflow/2p/volumevariables.hh
dumux/porousmediumflow/2p1c/volumevariables.hh 12 additions, 12 deletions

dumux/porousmediumflow/2p1c/volumevariables.hh
dumux/porousmediumflow/2p2c/volumevariables.hh 11 additions, 12 deletions

dumux/porousmediumflow/2p2c/volumevariables.hh
dumux/porousmediumflow/2pnc/volumevariables.hh 11 additions, 11 deletions

dumux/porousmediumflow/2pnc/volumevariables.hh
dumux/porousmediumflow/co2/volumevariables.hh 11 additions, 12 deletions

dumux/porousmediumflow/co2/volumevariables.hh

with 98 additions and 73 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment