Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-appl
dumux-preCICE
Commits
e4db13fb
Commit
e4db13fb
authored
Oct 13, 2021
by
Alexander Jaust
Browse files
[fix] partially bump compatibility to dumux 3.4
parent
4d40babd
Changes
3
Hide whitespace changes
Inline
Side-by-side
appl/coupling-ff-pm/fvca-iterative/ffproblem-reversed.hh
View file @
e4db13fb
...
...
@@ -28,6 +28,7 @@
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/numeqvector.hh>
#include
<dumux/material/components/simpleh2o.hh>
#include
<dumux/material/fluidsystems/1pliquid.hh>
...
...
@@ -105,7 +106,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
//using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
using
SubControlVolumeFace
=
...
...
@@ -115,7 +117,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
NumEqVector
=
Dumux
::
NumEqVector
<
PrimaryVariables
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
#if ENABLEMONOLITHIC
...
...
appl/coupling-ff-pm/fvca-iterative/main_fvca-iterative-pm.cc
View file @
e4db13fb
...
...
@@ -41,7 +41,6 @@ bool printstuff = false;
#include
<dumux/common/math.hh>
#include
<dumux/common/parameters.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/valgrind.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
...
...
appl/coupling-ff-pm/fvca-iterative/pmproblem-reversed.hh
View file @
e4db13fb
...
...
@@ -29,6 +29,7 @@
#endif
#include
<dune/grid/yaspgrid.hh>
#include
<dumux/common/numeqvector.hh>
#include
<dumux/discretization/cctpfa.hh>
...
...
@@ -96,8 +97,8 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
GridView
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
NumEqVector
=
Dumux
::
NumEqVector
<
PrimaryVariables
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment