dumux merge requestshttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests2017-12-22T13:12:28Zhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/664Feature/3p3cnext2017-12-22T13:12:28ZTimo Kochtimokoch@math.uio.noFeature/3p3cnexthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/663Fix/patches for opm2017.102017-12-11T11:56:56ZBernd FlemischFix/patches for opm2017.10Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/662Cleanup/staggered ff2017-12-22T13:12:26ZKilian WeishauptCleanup/staggered ffimplements #417 and #419
This MR helps to distinguish better between physical model and discretization.implements #417 and #419
This MR helps to distinguish better between physical model and discretization.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/661Feature/move properties to modelheader2017-12-22T13:12:25ZTimo Kochtimokoch@math.uio.noFeature/move properties to modelheaderFixes #419.Fixes #419.Simon EmmertSimon Emmerthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/659fix add_dumux_test for use with Dune 2.62017-12-11T09:42:00ZBernd Flemischfix add_dumux_test for use with Dune 2.6add_dumux_test forwards to dune_add_test. Since Dune 2.6, this takes
only the "real" command behind COMMAND, the arguments to that command
have to follow behind CMD_ARGS.add_dumux_test forwards to dune_add_test. Since Dune 2.6, this takes
only the "real" command behind COMMAND, the arguments to that command
have to follow behind CMD_ARGS.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://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/656Cleanup/2pnc2017-12-22T13:12:26ZSimon EmmertCleanup/2pnccleanup of some unnecessary includes in the 2pnc-model and change of model.hh and properties.hh according to #419cleanup of some unnecessary includes in the 2pnc-model and change of model.hh and properties.hh according to #419Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/655[headercheck] add missing includes2017-12-07T22:02:44ZBernd Flemisch[headercheck] add missing includesBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/653Feature/test angeli2017-12-08T15:55:43ZMelanie LippFeature/test angeliKilian WeishauptKilian Weishaupthttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/652Feature/new mineralization structure2017-12-22T13:12:25ZSimon EmmertFeature/new mineralization structureThis creates a new mineralization folder for porousmediumflow and makes most of the 2pncmin stuff obsolete. 1pncmin will be adapted accordingly to inherit everything from the mineralization model.
This works, as soon as the math-update ...This creates a new mineralization folder for porousmediumflow and makes most of the 2pncmin stuff obsolete. 1pncmin will be adapted accordingly to inherit everything from the mineralization model.
This works, as soon as the math-update with vtmv is finished. (2pncmin models don't compile in general at the moment)Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.nohttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/650Feature/2p2cnext2017-12-22T13:12:28ZTimo Kochtimokoch@math.uio.noFeature/2p2cnextPorted 2p2c and co2 model and all test.
Unfortunately most tests still fail.
In the co2ni tests the enthalpy is very different from the reference. This might point to something why the 2p2cni tests also fail. The co2_tpfa test probably f...Ported 2p2c and co2 model and all test.
Unfortunately most tests still fail.
In the co2ni tests the enthalpy is very different from the reference. This might point to something why the 2p2cni tests also fail. The co2_tpfa test probably fails because it is an unstructured grid and we do something different for tpfa there. We might check by computing old style transmissibilities.
Introduces boundary flags for box/tpfa subcontrol volume faces. Not sure if this is the best solution though.Dennis GläserDennis Gläserhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/649[CHANGELOG] add link to multidomain README2017-12-07T12:07:55ZBernd Flemisch[CHANGELOG] add link to multidomain README(cherry picked from commit f9cc226c525ce678e4daa01170e46dbc7c4560b2)(cherry picked from commit f9cc226c525ce678e4daa01170e46dbc7c4560b2)Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/648update CHANGELOG.md, bump handbook version2017-12-07T11:15:20ZBernd Flemischupdate CHANGELOG.md, bump handbook versionBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/647[headercheck] add missing includes2017-12-07T10:12:57ZBernd Flemisch[headercheck] add missing includesBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/646[multidomaingrid] include <numeric> before multidomaingrid.hh2017-12-07T09:56:55ZBernd Flemisch[multidomaingrid] include <numeric> before multidomaingrid.hhOtherwise, std::partial_sum is not found for newer STL versions.
In principle, this should be fixed upstream...Otherwise, std::partial_sum is not found for newer STL versions.
In principle, this should be fixed upstream...Bernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/645update list of copyright holders2017-12-07T09:51:36ZBernd Flemischupdate list of copyright holdersBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/644[2pnc] remove unused variable2017-12-07T09:43:59ZBernd Flemisch[2pnc] remove unused variableBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/643[sequential] remove unused variables from MPFA-L velocity models2017-12-07T09:38:38ZBernd Flemisch[sequential] remove unused variables from MPFA-L velocity modelsBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/642[doc] update the parameter list2017-12-07T09:35:20ZBernd Flemisch[doc] update the parameter listBernd FlemischBernd Flemischhttps://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/merge_requests/641[sequential] make tests compile again2017-12-07T00:38:29ZBernd Flemisch[sequential] make tests compile againAdapt the sequential tests to the changes in next. Don't care too
much about deprecation warnings at this stage. All tests compile
and run. On my system, the 2p adaptive tests fail. Wait for
buildbot to confirm this or not.Adapt the sequential tests to the changes in next. Don't care too
much about deprecation warnings at this stage. All tests compile
and run. On my system, the 2p adaptive tests fail. Wait for
buildbot to confirm this or not.Timo Kochtimokoch@math.uio.noTimo Kochtimokoch@math.uio.no