Merge branch 'feature/ions' into 'master' (3a648102) · 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

3a648102

Commit 3a648102 authored 6 years ago by Timo Koch

Downloads
- Plain Diff

Merge branch 'feature/ions' into 'master'

Introduce ions and test ions and solid components

See merge request !1094

parents a0e7421e f771d562

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

dumux/material/components/CMakeLists.txt 3 additions, 0 deletions

dumux/material/components/CMakeLists.txt
dumux/material/components/calcite.hh 97 additions, 0 deletions

dumux/material/components/calcite.hh
dumux/material/components/calciumion.hh 66 additions, 0 deletions

dumux/material/components/calciumion.hh
dumux/material/components/carbonateion.hh 66 additions, 0 deletions

dumux/material/components/carbonateion.hh
dumux/material/components/componenttraits.hh 4 additions, 0 deletions

dumux/material/components/componenttraits.hh
dumux/material/components/h2.hh 0 additions, 2 deletions

dumux/material/components/h2.hh
dumux/material/components/ion.hh 52 additions, 0 deletions

dumux/material/components/ion.hh
test/material/components/CMakeLists.txt 35 additions, 0 deletions

test/material/components/CMakeLists.txt
test/material/components/plotproperties.cc 79 additions, 0 deletions

test/material/components/plotproperties.cc
test/material/components/test_componenttraits.cc 1 addition, 0 deletions

test/material/components/test_componenttraits.cc

with 403 additions and 2 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