Commit 95d86194 authored by Santiago Ospina's avatar Santiago Ospina

Merge branch 'master' into 98-implement-a-simulation-object-for-transport-transportsimulation

# Conflicts:
#	doc/default_files/CMakeLists.txt
#	dune/dorie/model/richards/adaptivity/operator_error_indicator.hh
#	dune/dorie/model/richards/local_operator.hh
#	dune/dorie/model/richards/richards.hh
#	dune/dorie/solver/operator_DG.hh
#	dune/dorie/solver/richards_operator_DG.hh
Signed-off-by: Santiago Ospina De Los Ríos's avatarSantiago Ospina <santiago.ospina@iup.uni-heidelberg.de>
parent b22b4e61
/**
@defgroup Common Common
@{
@todo document models
@}
**/
\ No newline at end of file
......@@ -23,5 +23,6 @@
not specified, is understood that it is with respect to the face
(`_n` \f$\equiv\f$. `_n_f`).
@todo Update Dune::Dorie::Operator::RichardsDGSpatialOperator to the convention.
@}
**/
/**
@defgroup Models Models
@{
@todo document models
@todo document models
@}
@defgroup RichardsModel Richards
@ingroup Models
@{
@todo document richards model
@ingroup Models
@todo document richards model
@}
@defgroup TransportModel Transport
@ingroup Models
@{
@todo document transport model
@ingroup Models
@todo document transport model
@}
**/
\ No newline at end of file
......@@ -9,7 +9,7 @@ except NameError:
pass
# paths set by cmake
DORIEDIR = "/home/saospina/Codes/DUNE_INSTALL/Debug/dorie"
DORIEDIR = "/home/saospina/Codes/DUNE_INSTALL/Release/dorie"
MPIEXEC = "/usr/bin/mpiexec"
MPIEXEC_NUMPROC_FLAG = "-n"
MPIEXEC_PREFLAG = ""
......
Markdown is supported
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