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-repositories
dumux
Commits
7c58465c
Commit
7c58465c
authored
Dec 15, 2017
by
Dennis Gläser
Browse files
move localresidua from implicit to assembly folder
parent
852970f1
Changes
11
Hide whitespace changes
Inline
Side-by-side
dumux/CMakeLists.txt
View file @
7c58465c
add_subdirectory
(
"adaptive"
)
add_subdirectory
(
"assembly"
)
add_subdirectory
(
"common"
)
add_subdirectory
(
"discretization"
)
add_subdirectory
(
"freeflow"
)
...
...
dumux/assembly/CMakeLists.txt
0 → 100644
View file @
7c58465c
install
(
FILES
boxlocalassembler.hh
boxlocalresidual.hh
cclocalassembler.hh
cclocalresidual.hh
diffmethod.hh
fvassembler.hh
fvlocalresidual.hh
staggeredfvassembler.hh
staggeredlocalassembler.hh
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dumux/assembly
)
dumux/
implicit
/box
/
localresidual.hh
→
dumux/
assembly
/boxlocalresidual.hh
View file @
7c58465c
...
...
@@ -26,24 +26,22 @@
#include
<dune/geometry/type.hh>
#include
<dune/istl/matrix.hh>
#include
<dumux/common/
valgrind
.hh>
#include
<dumux/
implicit/
localresidual.hh>
#include
<dumux/common/
properties
.hh>
#include
<dumux/
assembly/fv
localresidual.hh>
namespace
Dumux
{
/*!
* \ingroup BoxModel
* \ingroup ImplicitLocalResidual
* \brief Element-wise calculation of the residual for models
* based on the fully implicit box scheme.
*
* \todo Please doc me more!
*/
template
<
class
TypeTag
>
class
BoxLocalResidual
:
public
Implicit
LocalResidual
<
TypeTag
>
class
BoxLocalResidual
:
public
FV
LocalResidual
<
TypeTag
>
{
using
ParentType
=
ImplicitLocalResidual
<
TypeTag
>
;
friend
class
ImplicitLocalResidual
<
TypeTag
>
;
using
ParentType
=
FVLocalResidual
<
TypeTag
>
;
using
Scalar
=
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
);
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
using
GridView
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
);
...
...
dumux/
implicit/cellcentered/
localresidual.hh
→
dumux/
assembly/cc
localresidual.hh
View file @
7c58465c
...
...
@@ -25,23 +25,22 @@
#include
<dune/istl/matrix.hh>
#include
<dumux/common/
valgrind
.hh>
#include
<dumux/
implicit/
localresidual.hh>
#include
<dumux/common/
properties
.hh>
#include
<dumux/
assembly/fv
localresidual.hh>
namespace
Dumux
{
/*!
* \ingroup CCModel
* \ingroup CCLocalResidual
* \brief Element-wise calculation of the residual for models
* based on the fully implicit cell-centered scheme.
*
* \todo Please doc me more!
*/
template
<
class
TypeTag
>
class
CCLocalResidual
:
public
Implicit
LocalResidual
<
TypeTag
>
class
CCLocalResidual
:
public
FV
LocalResidual
<
TypeTag
>
{
using
ParentType
=
Implicit
LocalResidual
<
TypeTag
>
;
using
ParentType
=
FV
LocalResidual
<
TypeTag
>
;
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
using
Element
=
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
::
template
Codim
<
0
>
::
Entity
;
using
ElementResidualVector
=
Dune
::
BlockVector
<
typename
GET_PROP_TYPE
(
TypeTag
,
NumEqVector
)
>
;
...
...
dumux/assembly/fvassembler.hh
View file @
7c58465c
...
...
@@ -30,7 +30,6 @@
#include
<dumux/common/properties.hh>
#include
<dumux/common/timeloop.hh>
#include
<dumux/implicit/localresidual.hh>
#include
<dumux/discretization/methods.hh>
#include
<dumux/parallel/vertexhandles.hh>
...
...
dumux/
implicit/
localresidual.hh
→
dumux/
assembly/fv
localresidual.hh
View file @
7c58465c
...
...
@@ -18,10 +18,10 @@
*****************************************************************************/
/*!
* \file
* \brief Calculates the element-wise residual of f
ully-implicit
models.
* \brief Calculates the element-wise residual of f
inite-volume
models.
*/
#ifndef DUMUX_
IMPLICIT
_LOCAL_RESIDUAL_HH
#define DUMUX_
IMPLICIT
_LOCAL_RESIDUAL_HH
#ifndef DUMUX_
FV
_LOCAL_RESIDUAL_HH
#define DUMUX_
FV
_LOCAL_RESIDUAL_HH
#include
<dune/istl/matrix.hh>
...
...
@@ -35,7 +35,6 @@ namespace Dumux
{
/*!
* \ingroup ImplicitLocalResidual
* \brief Element-wise calculation of the residual matrix for models
* using a fully implicit discretization.
*
...
...
@@ -43,7 +42,7 @@ namespace Dumux
* static polymorphism.
*/
template
<
class
TypeTag
>
class
Implicit
LocalResidual
class
FV
LocalResidual
{
using
Implementation
=
typename
GET_PROP_TYPE
(
TypeTag
,
LocalResidual
);
using
Problem
=
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
);
...
...
@@ -67,10 +66,10 @@ class ImplicitLocalResidual
public:
//! the constructor for stationary problems
Implicit
LocalResidual
()
:
prevSol_
(
nullptr
)
{}
FV
LocalResidual
()
:
prevSol_
(
nullptr
)
{}
//! the constructor for instationary problems
Implicit
LocalResidual
(
std
::
shared_ptr
<
TimeLoop
>
timeLoop
)
FV
LocalResidual
(
std
::
shared_ptr
<
TimeLoop
>
timeLoop
)
:
timeLoop_
(
timeLoop
)
,
prevSol_
(
nullptr
)
{}
...
...
dumux/discretization/box/properties.hh
View file @
7c58465c
...
...
@@ -29,13 +29,14 @@
#include
<dune/common/fvector.hh>
#include
<dune/geometry/multilineargeometry.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/boundaryflag.hh>
#include
<dumux/discretization/methods.hh>
#include
<dumux/discretization/fvproperties.hh>
#include
<dumux/implicit/box/elementboundarytypes.hh>
#include
<dumux/
implicit
/box
/
localresidual.hh>
#include
<dumux/
assembly
/boxlocalresidual.hh>
#include
<dumux/discretization/box/subcontrolvolume.hh>
#include
<dumux/discretization/box/subcontrolvolumeface.hh>
...
...
dumux/discretization/cellcentered/mpfa/properties.hh
View file @
7c58465c
...
...
@@ -30,11 +30,13 @@
#include
<dune/common/fvector.hh>
#include
<dune/geometry/multilineargeometry.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/discretization/methods.hh>
#include
<dumux/discretization/fvproperties.hh>
#include
<dumux/implicit/cellcentered/elementboundarytypes.hh>
#include
<dumux/
implicit/cellcentered/
localresidual.hh>
#include
<dumux/
assembly/cc
localresidual.hh>
#include
<dumux/discretization/cellcentered/globalvolumevariables.hh>
#include
<dumux/discretization/cellcentered/subcontrolvolume.hh>
...
...
dumux/discretization/cellcentered/tpfa/properties.hh
View file @
7c58465c
...
...
@@ -31,6 +31,7 @@
#include
<dune/common/reservedvector.hh>
#include
<dune/geometry/multilineargeometry.hh>
#include
<dumux/common/properties.hh>
#include
<dumux/common/boundaryflag.hh>
#include
<dumux/discretization/methods.hh>
...
...
@@ -40,7 +41,7 @@
#include
<dumux/discretization/cellcentered/subcontrolvolume.hh>
#include
<dumux/implicit/cellcentered/elementboundarytypes.hh>
#include
<dumux/
implicit/cellcentered/
localresidual.hh>
#include
<dumux/
assembly/cc
localresidual.hh>
#include
<dumux/discretization/cellcentered/connectivitymap.hh>
#include
<dumux/discretization/cellcentered/elementsolution.hh>
...
...
dumux/implicit/box/CMakeLists.txt
View file @
7c58465c
...
...
@@ -2,11 +2,5 @@
#install headers
install
(
FILES
intersectiontovertexbc.hh
assembler.hh
elementboundarytypes.hh
elementvolumevariables.hh
fvelementgeometry.hh
localresidual.hh
properties.hh
propertydefaults.hh
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dumux/implicit/box
)
dumux/implicit/cellcentered/CMakeLists.txt
View file @
7c58465c
#install headers
install
(
FILES
assembler.hh
elementboundarytypes.hh
elementvolumevariables.hh
fvelementgeometry.hh
localresidual.hh
properties.hh
propertydefaults.hh
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dumux/implicit/cellcentered
)
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