dumux merge requestshttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests2017-12-22T13:12:22Zhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/606[tests][2pnc][3p] fix COMMAND and CMD_ARGS for dune_add_test2017-12-22T13:12:22ZSimon Emmert[tests][2pnc][3p] fix COMMAND and CMD_ARGS for dune_add_testThis fixes dune_add_test with a reference file, when working with the newest version of dune-common.This fixes dune_add_test with a reference file, when working with the newest version of dune-common.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/682Fix/doxy 1p2017-12-22T13:12:22ZSimon EmmertFix/doxy 1pThis should be the correct format for doxygen, not everything is well documented yet!This should be the correct format for doxygen, not everything is well documented yet!Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/716[mpnc][localresidual] Use correct type for ElementResidualVector2017-12-22T13:12:22ZKilian Weishaupt[mpnc][localresidual] Use correct type for ElementResidualVectorBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/626[sequential] Fix test_dec1p on next.2017-12-22T13:12:22ZBernd Flemisch[sequential] Fix test_dec1p on next.Use getParam instead of the old macro and Components::Constant
instead of Unit.Use getParam instead of the old macro and Components::Constant
instead of Unit.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/580Feature/element sol class2017-12-22T13:12:22ZTimo Kochtimokoch@math.uio.noFeature/element sol class* Introduce classes for Box and CC ElementSolution
* Correct interfaces in the local residual. There we need a vector of NumEqVectors and not element solutions!* Introduce classes for Box and CC ElementSolution
* Correct interfaces in the local residual. There we need a vector of NumEqVectors and not element solutions!Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/546Feature/copy matrix2017-12-22T13:12:22ZKilian WeishauptFeature/copy matrixConverts a `Dune:MultitypeBlockMatrix` to a plain `BCRS` matrix with block size 1x1.
Increases convenience. Nested `MultitypeBlockMatrices` can be handled as well by passing a `std::tuple` of `std::tuple`s containing references to th...Converts a `Dune:MultitypeBlockMatrix` to a plain `BCRS` matrix with block size 1x1.
Increases convenience. Nested `MultitypeBlockMatrices` can be handled as well by passing a `std::tuple` of `std::tuple`s containing references to the individual sub-matrices (similar to how it is done with `Dune:MultitypeBlockVector` to construct the `MultitypeBlockMatrix`).
This even seems to increase performance a bit:
| test_donea old | test_donea new |
|----------------|----------------|
| 0.372829 | 0.318897 |
| 0.358279 | 0.295304 |
| 0.434373 | 0.289843 |
| 0.3567 | 0.312524 |
| __0.38054525__ | __0.304142__ |
__TODO__
- [x] create something similar for `Dune:MultitypeBlockVector`
- [x] use in `dumux/mixeddimension`Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/715[1p][sequential] Replace Fluid by FluidSystem2017-12-22T13:12:22ZKilian Weishaupt[1p][sequential] Replace Fluid by FluidSystem* type Fluid does not exists anymore* type Fluid does not exists anymoreDennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/595[properties] Add PhaseIdx as a common property2017-12-22T13:12:22ZKilian Weishaupt[properties] Add PhaseIdx as a common propertyTimo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/697Feature/2p docu2017-12-22T13:12:22ZSina AckermannFeature/2p docuAdapt doxygen documentation (except for 2p2c/sequential).Adapt doxygen documentation (except for 2p2c/sequential).Simon EmmertSimon Emmerthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/658Cleanup/remove default components prop2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.noCleanup/remove default components propFixes #418.
* Removes properties `Components`, `Fluid`, `WettingPhase`, `NonwettingPhase`
Except in tutorial as it will be removed by Johannes' branch.Fixes #418.
* Removes properties `Components`, `Fluid`, `WettingPhase`, `NonwettingPhase`
Except in tutorial as it will be removed by Johannes' branch.Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/632Merge feature/2pncmin into next2017-12-22T13:12:21ZSimon EmmertMerge feature/2pncmin into nextThis is the updated 2pncmin model, where the test does not pass yet!
Anyhow, this is a stripped down version doing merely the precipitation related things and inherits everything else from the 2pnc-model. Since the 2pnc does not have a ...This is the updated 2pncmin model, where the test does not pass yet!
Anyhow, this is a stripped down version doing merely the precipitation related things and inherits everything else from the 2pnc-model. Since the 2pnc does not have a proper test at the moment, this should be merged and checked again once the 2pnc model is safe (and the 2p2c-test passes with the 2pnc-model).Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/614Fix/2pnc ni property2017-12-22T13:12:21ZSimon EmmertFix/2pnc ni propertyNiOutputLevel property was removed, this fixes it for the 2pnc test by deleting the property and removing the temperature from the isothermal referencesNiOutputLevel property was removed, this fixes it for the 2pnc test by deleting the property and removing the temperature from the isothermal referencesKilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/578Feature/3p on new next2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.noFeature/3p on new next- [x] cleanup properties and set defaults - [x] cleanup properties and set defaults Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/573Feature/restructure type and prop tags2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.noFeature/restructure type and prop tags* All properties are defined in a single header dumux/common/properties.hh. This is because property declarations are global in the namespace Properties. In order to simplify forward declarations and overview a single header file is conv...* All properties are defined in a single header dumux/common/properties.hh. This is because property declarations are global in the namespace Properties. In order to simplify forward declarations and overview a single header file is convenient.
* New TypeTags for discretizations and physics / models
* Removed TypeTag Implicit since implicit and explicit models are no longer different except for the assembler which is set directly in the main file.Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/592[newton] Remove TypeTag dependency of NewtonMethod class2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.no[newton] Remove TypeTag dependency of NewtonMethod classAdapt all tests accordingly. Classes that don't need a TypeTag and
only a few template arguments are more flexible.Adapt all tests accordingly. Classes that don't need a TypeTag and
only a few template arguments are more flexible.Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/591Feature/udpate mapper2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.noFeature/udpate mapperMapper has to be updated when the grid changed. This is now done in fvgeometry update.Mapper has to be updated when the grid changed. This is now done in fvgeometry update.Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/696Feature/doc logo2017-12-22T13:12:21ZTimo Kochtimokoch@math.uio.noFeature/doc logoSimon EmmertSimon Emmerthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/533[vtk] Improve velocity output for box 1d2017-12-22T13:12:21ZKilian Weishaupt[vtk] Improve velocity output for box 1d* for box, the velocities are located at the vertices
* for 1d, this does not make sense
* we move the velocities to the 1d element centers, which also
allows easier calculation* for box, the velocities are located at the vertices
* for 1d, this does not make sense
* we move the velocities to the 1d element centers, which also
allows easier calculationTimo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/532Feature/improve global fv geometry2017-12-22T13:12:20ZKilian WeishauptFeature/improve global fv geometry- [x] Adapt for `mimetic`
- [x] work on `intersectionMapper` for unstructured grids
- [x] include `numFaces(element)` in `intersectionMapper`?
- [x] Are the names ok?- [x] Adapt for `mimetic`
- [x] work on `intersectionMapper` for unstructured grids
- [x] include `numFaces(element)` in `intersectionMapper`?
- [x] Are the names ok?Martin SchneiderMartin Schneiderhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/713[doxygen]remove links to parameter and featurelist temporarily for 3.0.0-alph...2017-12-22T13:12:20ZSimon Emmert[doxygen]remove links to parameter and featurelist temporarily for 3.0.0-alpha releaseBernd FlemischBernd Flemisch