-
- Downloads
[!3] Resolve "Include more options to initializate stetes"
Merge branch '2-include-more-options-to-initializate-stetes' into 'master' ref:copasi/dune-copasi ### What does this MR do? Implements TIFF input data for the solver. The section model.data is read if defined. It should contain a key assigned to a path of a valid gayscale tiff of 16 bits. e.g. [model.data] tiff_data = data/tiff/flower-minisblack-16.tif The key can be latter used in the initial condition of a compartment as a function of the **grid** \$x\$ and \$y\$ coordinates. If arguments are out of bound of the tiff image the function will return 0. [model.<compartment>.initial] u_0 = tiff_data(x,y) The arguments of the function may be anything defined on muparser. This is useful to shift and scale the data. Additionaly, data is interpreted between 0 and 1 depending on the photometric information (*zero_is_white* or *zero_is_black*). In case data has another scale, its result may be scaled as any other function in muparser. e.g. [model.<compartment>.initial] u_0 = 1.3+5.1*tiff_data(2*x, y+0.25) ### Is there something that needs to be double checked? <!-- Is there something a reviewer should look out for _especially_? --> No ### Can this MR be accepted? - [x] Implemented \... - [x] Generic tiff reader - [x] muParser function for tiff data - [x] Added/Updated tests: - [x] Unit test for tiff reader - [x] System test for initial condition - [ ] Pipelines passing <!-- please check for new warnings --> <!-- change all occurences of <branch> for your branch name --> - [x] [![Build Status]] - [x] [![Build Status][1]] - [ ] [![Build status][2]] - [x] Delete branch option set <!-- unless there's a good reason --> ### Related issues Closes [#2] <!-- For automatic closing, do not forget the commas between issue numbers--> <!-- PLEASE READ THIS! A Merge Request should be associated to a certain task or issue. Its changes are supposed to be merged into the master branch. Briefly explain __how__ you achieved the proposal of the task. IMPORTANT: Make sure to set the merge request WIP if you are not finished yet. --> See merge request [!3] [Build Status]: https://gitlab.dune-project.org/copasi/dune-copasi/badges/2-include-more-options-to-initializate-stetes/pipeline.svg [![Build Status]]: https://gitlab.dune-project.org/copasi/dune-copasi/pipelines [1]: https://travis-ci.org/SoilRos/dune-copasi.svg?branch=2-include-more-options-to-initializate-stetes [![Build Status][1]]: https://travis-ci.org/SoilRos/dune-copasi [2]: https://ci.appveyor.com/api/projects/status/6605joy2w17qvca8/branch/2-include-more-options-to-initializate-stetes?svg=true [![Build status][2]]: https://ci.appveyor.com/project/SoilRos/dune-copasi/history [#2]: gitlab.dune-project.org/NoneNone/issues/2 [!3]: gitlab.dune-project.org/copasi/dune-copasi/merge_requests/3 Closes #2
No related branches found
No related tags found
Pipeline #21478 passed
Stage: setup
Stage: build
Stage: unit_tests
Stage: system_tests
Stage: deploy
Showing
- .ci/README.md 1 addition, 1 deletion.ci/README.md
- .ci/setup.sh 1 addition, 1 deletion.ci/setup.sh
- .travis.yml 7 additions, 5 deletions.travis.yml
- CMakeLists.txt 2 additions, 0 deletionsCMakeLists.txt
- README.md 1 addition, 1 deletionREADME.md
- appveyor.yml 11 additions, 2 deletionsappveyor.yml
- cmake/modules/DuneCopasiMacros.cmake 2 additions, 1 deletioncmake/modules/DuneCopasiMacros.cmake
- docker/dune-copasi.dockerfile 1 addition, 1 deletiondocker/dune-copasi.dockerfile
- dune/copasi/local_operator.hh 16 additions, 2 deletionsdune/copasi/local_operator.hh
- dune/copasi/local_operator_multidomain.hh 7 additions, 0 deletionsdune/copasi/local_operator_multidomain.hh
- dune/copasi/model_multidomain_diffusion_reaction.cc 21 additions, 3 deletionsdune/copasi/model_multidomain_diffusion_reaction.cc
- dune/copasi/muparser_data_handler.hh 67 additions, 0 deletionsdune/copasi/muparser_data_handler.hh
- dune/copasi/pdelab_expression_adapter.hh 43 additions, 12 deletionsdune/copasi/pdelab_expression_adapter.hh
- dune/copasi/tiff_grayscale.hh 158 additions, 0 deletionsdune/copasi/tiff_grayscale.hh
- lib/CMakeLists.txt 1 addition, 1 deletionlib/CMakeLists.txt
- src/CMakeLists.txt 1 addition, 1 deletionsrc/CMakeLists.txt
- test/CMakeLists.txt 11 additions, 0 deletionstest/CMakeLists.txt
- test/data/tiff/flower-minisblack-04.tif 0 additions, 0 deletionstest/data/tiff/flower-minisblack-04.tif
- test/data/tiff/flower-minisblack-08.tif 0 additions, 0 deletionstest/data/tiff/flower-minisblack-08.tif
- test/data/tiff/flower-minisblack-16.tif 0 additions, 0 deletionstest/data/tiff/flower-minisblack-16.tif
dune/copasi/muparser_data_handler.hh
0 → 100644
dune/copasi/tiff_grayscale.hh
0 → 100644
test/data/tiff/flower-minisblack-04.tif
0 → 100644
File added
test/data/tiff/flower-minisblack-08.tif
0 → 100644
File added
test/data/tiff/flower-minisblack-16.tif
0 → 100644
File added
Please register or sign in to comment