Merge branch 'feature/data-input' into 'master' (7b6a01f2) · 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

7b6a01f2

Commit 7b6a01f2 authored 4 years ago by Dennis Gläser

Downloads
- Plain Diff

Merge branch 'feature/data-input' into 'master'

Feature/data input

See merge request !1967

parents 179386b9 b62aa81e

No related branches found

No related tags found

1 merge request!1967Feature/data input

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

dumux/io/container.hh 22 additions, 5 deletions

dumux/io/container.hh
dumux/io/vtk/vtkreader.hh 4 additions, 5 deletions

dumux/io/vtk/vtkreader.hh
test/io/CMakeLists.txt 3 additions, 2 deletions

test/io/CMakeLists.txt
test/io/inputdata/CMakeLists.txt 2 additions, 0 deletions

test/io/inputdata/CMakeLists.txt
test/io/inputdata/config.ini 6 additions, 0 deletions

test/io/inputdata/config.ini
test/io/inputdata/coordinates.txt 4 additions, 0 deletions

test/io/inputdata/coordinates.txt
test/io/inputdata/mydata.xml 13 additions, 0 deletions

test/io/inputdata/mydata.xml
test/io/inputdata/numbers.txt 4 additions, 0 deletions

test/io/inputdata/numbers.txt
test/io/inputdata/test_io_data_input.cc 112 additions, 0 deletions

test/io/inputdata/test_io_data_input.cc

with 170 additions and 12 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