dumux merge requestshttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests2019-08-07T09:34:47Zhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1661Feature/output vtk path from inputfile2019-08-07T09:34:47ZTimo Kochtimokoch@math.uio.noFeature/output vtk path from inputfile<!--
Thanks for sending a merge request!
If this is your first time, read our [contributing guidelines](/CONTRIBUTING.md)
-->
**What this MR does / why does DuMux need it**:
This adds a path prefix to the name given to the output modu...<!--
Thanks for sending a merge request!
If this is your first time, read our [contributing guidelines](/CONTRIBUTING.md)
-->
**What this MR does / why does DuMux need it**:
This adds a path prefix to the name given to the output module. This way the vtk output files can be written to a different folder.
<!--
**Which issue this MR fixes** *(optional - uncomment and add issue)*:
fixes #
-->
**Special notes for your reviewer**:
The argument `path` of the `Dune::VTKSequenceWriter` only changes the path of the vtu files, not the pvd, so it doesn't give the desired effect.3.1Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1656[glue] check non-uniqueness of raw intersection geometries only if dim1 != dim22019-07-05T16:13:53ZDennis Gläser[glue] check non-uniqueness of raw intersection geometries only if dim1 != dim2This is an memory and runtime optimization for the equidimensional intersection case.This is an memory and runtime optimization for the equidimensional intersection case.3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1652[test] Remove numpy dependency2019-06-27T18:07:59ZTimo Kochtimokoch@math.uio.no[test] Remove numpy dependencyFixes #731Fixes #7313.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1648WIP: Feature/simplify effectivelaws - Do not merge!2019-08-05T18:27:27ZGabi SeitzWIP: Feature/simplify effectivelaws - Do not merge!Fixes #711
Fixes #710
Fixes #733
* [x] Depends on a fix in MPFA to handle zero coefficients.
This MR is outdated and superseded by !1684
Fixes #711
Fixes #710
Fixes #733
* [x] Depends on a fix in MPFA to handle zero coefficients.
This MR is outdated and superseded by !1684
3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1647Feature/generalize fvgridgeometry2019-12-19T11:11:44ZSimon EmmertFeature/generalize fvgridgeometry**What this MR does / why does DuMux need it**:
So far this renames FVGridGeometry to GridGeometry for box, tpfa, mpfa and staggered.
** Things left to do:**
* [x] deprecate FVGridGeometry property correctly
* [x] open new M...**What this MR does / why does DuMux need it**:
So far this renames FVGridGeometry to GridGeometry for box, tpfa, mpfa and staggered.
** Things left to do:**
* [x] deprecate FVGridGeometry property correctly
* [x] open new MR with renaming and deprecation of all places where a public FVGridGeometry is used --> see !1700
* [x] discuss if a warning needs to be thrown and where (e.g. similar to the property-system warning
* [x] merge !1700 after testing this branch thoroughly (this branch is how it will look like to a user, before taking care of the deprecation warnings)
<!--
**Which issue this MR fixes** *(optional - uncomment and add issue)*:
fixes #719
-->
**Special notes for your reviewer**:
This now only changes and deprecates the aliases for the fvelementgeometry.hh files, the renaming and deprecation of all other instances (in the tests etc) will be done in a new MR.
Fixes #719 3.1Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1646Feature/optimize projector2019-07-01T09:44:53ZDennis GläserFeature/optimize projectorFixes #708 Fixes #708 3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1625Feature/2d 2d intersections2019-06-17T12:10:49ZDennis GläserFeature/2d 2d intersectionsDepends on the hasParamInGroup fix in !1628.Depends on the hasParamInGroup fix in !1628.3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1620Feature/monotone cubic spline2019-05-29T10:08:34ZTimo Kochtimokoch@math.uio.noFeature/monotone cubic splineFixes #712.
Implements monotone cubic spline due to Fritsch & Butland (1984) (https://doi.org/10.1137/0905021)Fixes #712.
Implements monotone cubic spline due to Fritsch & Butland (1984) (https://doi.org/10.1137/0905021)3.1Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1616Feature/free-function-make-glue2019-05-27T11:31:39ZDennis GläserFeature/free-function-make-glueThis moves the class MixedDimensionGlue into the more generic MultiDomainGlue class. The order of the template and constructor arguments now doesn't matter anymore, as additionally we provide the overloads of GeometryIntersection for the...This moves the class MixedDimensionGlue into the more generic MultiDomainGlue class. The order of the template and constructor arguments now doesn't matter anymore, as additionally we provide the overloads of GeometryIntersection for the reverse order of template arguments.3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1614Feature/fem gridgeometry2019-05-24T12:46:29ZTimo Kochtimokoch@math.uio.noFeature/fem gridgeometry3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1613Feature/rename basevfgridgeometry2019-05-23T09:09:22ZTimo Kochtimokoch@math.uio.noFeature/rename basevfgridgeometry3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1612[io] Add RasterImageReader2019-06-01T10:53:35ZKilian Weishaupt[io] Add RasterImageReader- [x] make reader static/stateless
- [x] add documentation and changelog- [x] make reader static/stateless
- [x] add documentation and changelog3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1611[io][gridmanager] Improve error message if grid manager not found2019-05-22T18:17:12ZTimo Kochtimokoch@math.uio.no[io][gridmanager] Improve error message if grid manager not found3.1Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1610Feature/tracer multiphase test zero saturation2020-03-30T20:16:37ZTimo Kochtimokoch@math.uio.noFeature/tracer multiphase test zero saturationFixes #704 by introducing a regularization for the saturation if it is zero to avoid singular matrices in areas where there is no transporting fluid and hence no tracer.
Solution:
![tracer](/uploads/518c3151f82f9c3aea77b556c4a6726c/t...Fixes #704 by introducing a regularization for the saturation if it is zero to avoid singular matrices in areas where there is no transporting fluid and hence no tracer.
Solution:
![tracer](/uploads/518c3151f82f9c3aea77b556c4a6726c/tracer.gif)
Depends on #733 to be fixed3.2Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1609Feature/projector2019-05-27T12:21:05ZDennis GläserFeature/projector3.1Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1607Feature/new materiallaw 2p2020-10-30T20:50:12ZTimo Kochtimokoch@math.uio.noFeature/new materiallaw 2p**Current status**
* The material law classes are built in a bit complicated way as a series of wrappers
* In order to evaluate a law you need the type of the law and the parameters
* Regularization is somewhat inflexible
* It's not pos...**Current status**
* The material law classes are built in a bit complicated way as a series of wrappers
* In order to evaluate a law you need the type of the law and the parameters
* Regularization is somewhat inflexible
* It's not possible to cache anything in the laws
**What this MR does / why does DuMux need it**:
* New class that gets policy template arguments instead of wrappers
* New fluidmatrixinteraction object that knows it's parameterization
* A single object that knows how to evaluate a law and can also cache things
* Flexible regularization that also allows e.g. for approximation / spline-interpolation in any part of the function
Fixes #319.
**Special notes for your reviewer / TODO**:
* [x] !2249 Should be merged first.
* [x] ~~Add update function to update the parameters of a function~~ (not implemented for now. Can be added later)
* [x] deprecation in volume variables and other call sites (-> !2260)
* [x] do the same for the interfacial area laws (non-equilibrium) (-> !2260)
* [x] deprecate old laws
* [x] adjust material law unit test to new laws
* [x] implement brooks-corey
* [x] implement twop default regularization for brooks-corey & vangenuchten
* [x] reimplement weird "regularized" linear law (should be a separate law in my opinion since the entire curve is changed)
* [x] reimplement heatpipelaw as example of a law that simply satisfies the interface (doesn't need to make use of `TwoPMaterialLaw`)
* [x] Change all spatialParams to get rid of deprecation warnings (could be done in team)
* [x] Use getters and setters for parameters (like before)
* [x] Adapt 2p sequential headers
* [x] Adapt plot material law to be able to use new style material laws
* [x] adapt box interface solver
* [x] adapt 2p incompressible local residual
* [x] adapt flash headers and tests3.3Kilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1605Feature/simplify effective laws2019-05-28T13:52:26ZTimo Kochtimokoch@math.uio.noFeature/simplify effective lawsThe effective laws are currently all pure
constitutive laws which do not depend on the discretization.
Hence, there is no geometry information / discretization should be needed.
This change enables using them inside the volume variables...The effective laws are currently all pure
constitutive laws which do not depend on the discretization.
Hence, there is no geometry information / discretization should be needed.
This change enables using them inside the volume variables easily. This way we might get
rid of them in the flux classes where they are currently used.3.1Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1602[properties] Deprecate macros2019-05-22T08:36:17ZTimo Kochtimokoch@math.uio.no[properties] Deprecate macros* Emit a deprecation warning from property macros header
* Add a pre-processor variable DUMUX_ENABLE_OLD_PROPERTY_MACROS which default to true
* Add description and explanation when to remove what
You can disable the warning by setting
...* Emit a deprecation warning from property macros header
* Add a pre-processor variable DUMUX_ENABLE_OLD_PROPERTY_MACROS which default to true
* Add description and explanation when to remove what
You can disable the warning by setting
DUMUX_ENABLE_OLD_PROPERTY_MACROS=0.
This will become the default after release 3.1.
Fixes #6003.1Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1601Feature/explicit diagonal solver2019-05-29T13:07:40ZTimo Kochtimokoch@math.uio.noFeature/explicit diagonal solverReduces solve time for block-diagonal matrices from explicit schemes to a minimum.
Fixes #563.Reduces solve time for block-diagonal matrices from explicit schemes to a minimum.
Fixes #563.3.1Martin SchneiderMartin Schneiderhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/1600Feature/simple cubic spline2019-05-21T08:22:48ZTimo Kochtimokoch@math.uio.noFeature/simple cubic splineA simple natural cubic spline implementation. Much simpler and more readable than the current spline implementation.
Efficient for interpolation of functions.A simple natural cubic spline implementation. Much simpler and more readable than the current spline implementation.
Efficient for interpolation of functions.Dennis GläserDennis Gläser