Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux-course
Commits
05fc9ae6
Commit
05fc9ae6
authored
Oct 30, 2020
by
Kilian Weishaupt
Browse files
Merge branch 'cleanup/release-3.3' into 'master'
Cleanup/release 3.3 See merge request
!105
parents
cc0f8257
89d775cb
Pipeline
#2307
passed with stage
in 32 seconds
Changes
63
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-basic/2p2cmain.cc
View file @
05fc9ae6
...
...
@@ -52,7 +52,7 @@
////////////////////////
// the main function
////////////////////////
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -120,7 +120,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
@@ -176,27 +176,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-basic/2pmain.cc
View file @
05fc9ae6
...
...
@@ -53,7 +53,7 @@
////////////////////////
// the main function
////////////////////////
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -125,7 +125,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
@@ -180,27 +180,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-basic/injection2p2cproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2P2C_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/binarycoefficients/h2o_n2.hh>
...
...
@@ -60,7 +61,7 @@ class Injection2p2cProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/exercise-basic/injection2pniproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace
Dumux
{
...
...
@@ -59,7 +60,7 @@ class Injection2PNIProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/exercise-basic/injection2pproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
#define DUMUX_EX_BASIC_PROBLEM_2P_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace
Dumux
{
...
...
@@ -59,7 +60,7 @@ class Injection2PProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/exercise-biomineralization/biominproblem.hh
View file @
05fc9ae6
...
...
@@ -25,6 +25,7 @@
#define DUMUX_EXERCISE_FOUR_PROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/porousmediumflow/problem.hh>
// TODO: dumux-course-task
...
...
@@ -46,7 +47,7 @@ class BioMinProblem : public PorousMediumFlowProblem<TypeTag>
using
SolidSystem
=
GetPropType
<
TypeTag
,
Properties
::
SolidSystem
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
...
...
exercises/exercise-biomineralization/fluidsystems/biomin.hh
View file @
05fc9ae6
...
...
@@ -332,7 +332,7 @@ public:
// assume brine with viscosity effect of Ca for the liquid phase.
if
(
phaseIdx
==
liquidPhaseIdx
)
return
Brine
::
liquidViscosity
(
temperature
,
pressure
);
;
return
Brine
::
liquidViscosity
(
temperature
,
pressure
);
// assume pure CO2 for the gas phase.
else
if
(
phaseIdx
==
gasPhaseIdx
)
...
...
exercises/exercise-biomineralization/main.cc
View file @
05fc9ae6
...
...
@@ -54,7 +54,7 @@
////////////////////////
// the main function
////////////////////////
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -130,7 +130,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
@@ -193,27 +193,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-coupling-ff-pm/2pspatialparams.hh
View file @
05fc9ae6
...
...
@@ -27,7 +27,7 @@
#include <dumux/material/spatialparams/fv.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivity
/
somerton.hh>
namespace
Dumux
{
...
...
exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
View file @
05fc9ae6
...
...
@@ -25,6 +25,7 @@
#include <dumux/freeflow/navierstokes/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
namespace
Dumux
{
...
...
@@ -41,7 +42,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
FVGridGeometry
::
LocalView
;
...
...
exercises/exercise-coupling-ff-pm/interface/main.cc
View file @
05fc9ae6
...
...
@@ -48,7 +48,7 @@
#include "properties.hh"
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -238,27 +238,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
namespace
Dumux
{
...
...
@@ -40,7 +41,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
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
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
View file @
05fc9ae6
...
...
@@ -25,6 +25,7 @@
#define DUMUX_STOKES1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
...
...
@@ -45,7 +46,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
FVGridGeometry
::
LocalView
;
...
...
exercises/exercise-coupling-ff-pm/models/main.cc
View file @
05fc9ae6
...
...
@@ -51,7 +51,7 @@
#include "properties.hh"
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -173,7 +173,7 @@ int main(int argc, char** argv) try
stokesGridVariables
->
cellCenterGridVariablesPtr
(),
darcyGridVariables
),
couplingManager
,
timeLoop
);
timeLoop
,
solOld
);
// the linear solver
using
LinearSolver
=
UMFPackBackend
;
...
...
@@ -236,27 +236,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
View file @
05fc9ae6
...
...
@@ -25,6 +25,7 @@
#define DUMUX_DARCY_SUBPROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/io/gnuplotinterface.hh>
...
...
@@ -44,7 +45,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolumeFace
=
typename
FVElementGeometry
::
SubControlVolumeFace
;
...
...
exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
View file @
05fc9ae6
...
...
@@ -24,6 +24,7 @@
#define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
...
...
@@ -46,7 +47,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
NavierStokesBoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
FVGridGeometry
::
LocalView
;
...
...
exercises/exercise-coupling-ff-pm/turbulence/main.cc
View file @
05fc9ae6
...
...
@@ -51,7 +51,7 @@
#include "properties.hh"
int
main
(
int
argc
,
char
**
argv
)
try
int
main
(
int
argc
,
char
**
argv
)
{
using
namespace
Dumux
;
...
...
@@ -178,7 +178,7 @@ int main(int argc, char** argv) try
stokesGridVariables
->
cellCenterGridVariablesPtr
(),
darcyGridVariables
),
couplingManager
,
timeLoop
);
timeLoop
,
solOld
);
// the linear solver
using
LinearSolver
=
UMFPackBackend
;
...
...
@@ -241,27 +241,3 @@ int main(int argc, char** argv) try
return
0
;
}
// end main
catch
(
Dumux
::
ParameterException
&
e
)
{
std
::
cerr
<<
std
::
endl
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
1
;
}
catch
(
Dune
::
DGFException
&
e
)
{
std
::
cerr
<<
"DGF exception thrown ("
<<
e
<<
"). Most likely, the DGF file name is wrong "
"or the DGF file is corrupted, "
"e.g. missing hash at end of file or wrong number (dimensions) of entries."
<<
" ---> Abort!"
<<
std
::
endl
;
return
2
;
}
catch
(
Dune
::
Exception
&
e
)
{
std
::
cerr
<<
"Dune reported error: "
<<
e
<<
" ---> Abort!"
<<
std
::
endl
;
return
3
;
}
catch
(...)
{
std
::
cerr
<<
"Unknown exception thrown! ---> Abort!"
<<
std
::
endl
;
return
4
;
}
exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
View file @
05fc9ae6
...
...
@@ -25,6 +25,7 @@
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
...
...
@@ -42,7 +43,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
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
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
exercises/exercise-fluidsystem/2p2cproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
// The base porous media box problem
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
namespace
Dumux
{
...
...
@@ -52,7 +53,7 @@ class ExerciseFluidsystemProblemTwoPTwoC : public PorousMediumFlowProblem<TypeTa
// Dumux specific types
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/exercise-fluidsystem/2pproblem.hh
View file @
05fc9ae6
...
...
@@ -26,6 +26,7 @@
// The porous media base problem
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
// The water component
...
...
@@ -58,7 +59,7 @@ class ExerciseFluidsystemProblemTwoP : public PorousMediumFlowProblem<TypeTag>
// Dumux specific types
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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