Commit f3e229a9 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[update] update monolithic 3d case to DuMuX 3.4

parent 77a2e470
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/cctpfa.hh> #include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/1p/model.hh> #include <dumux/porousmediumflow/1p/model.hh>
...@@ -88,8 +90,8 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -88,8 +90,8 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = using FVElementGeometry =
typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/material/components/simpleh2o.hh> #include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh> #include <dumux/material/fluidsystems/1pliquid.hh>
...@@ -108,7 +110,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag> ...@@ -108,7 +110,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>; using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>; using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment