Commit 77a2e470 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

[update] update partitioned 3d case to DuMuX 3.4

parent c1e834ef
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#endif #endif
#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>
...@@ -105,7 +106,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag> ...@@ -105,7 +106,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using Indices = using Indices =
typename GetPropType<TypeTag, Properties::ModelTraits>::Indices; typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>; using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FVElementGeometry = typename GridGeometry::LocalView; using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = using SubControlVolumeFace =
...@@ -115,7 +116,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag> ...@@ -115,7 +116,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
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 FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
#if ENABLEMONOLITHIC #if ENABLEMONOLITHIC
......
...@@ -41,7 +41,6 @@ bool printstuff = false; ...@@ -41,7 +41,6 @@ bool printstuff = false;
#include <dumux/common/math.hh> #include <dumux/common/math.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/valgrind.hh>
#include <dumux/linear/amgbackend.hh> #include <dumux/linear/amgbackend.hh>
#include <dumux/nonlinear/newtonsolver.hh> #include <dumux/nonlinear/newtonsolver.hh>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#endif #endif
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dumux/common/numeqvector.hh>
//****** uncomment for the last exercise *****// //****** uncomment for the last exercise *****//
// #include <dumux/io/grid/subgridgridcreator.hh> // #include <dumux/io/grid/subgridgridcreator.hh>
...@@ -100,8 +100,8 @@ class DarcySubProblem : public PorousMediumFlowProblemWithGravity<TypeTag> ...@@ -100,8 +100,8 @@ class DarcySubProblem : public PorousMediumFlowProblemWithGravity<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;
......
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