Commit 7c58465c authored by Dennis Gläser's avatar Dennis Gläser
Browse files

move localresidua from implicit to assembly folder

parent 852970f1
add_subdirectory("adaptive")
add_subdirectory("assembly")
add_subdirectory("common")
add_subdirectory("discretization")
add_subdirectory("freeflow")
......
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)
......@@ -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/fvlocalresidual.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 ImplicitLocalResidual<TypeTag>
class BoxLocalResidual : public FVLocalResidual<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);
......
......@@ -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/fvlocalresidual.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 ImplicitLocalResidual<TypeTag>
class CCLocalResidual : public FVLocalResidual<TypeTag>
{
using ParentType = ImplicitLocalResidual<TypeTag>;
using ParentType = FVLocalResidual<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)>;
......
......@@ -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>
......
......@@ -18,10 +18,10 @@
*****************************************************************************/
/*!
* \file
* \brief Calculates the element-wise residual of fully-implicit models.
* \brief Calculates the element-wise residual of finite-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 ImplicitLocalResidual
class FVLocalResidual
{
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
ImplicitLocalResidual() : prevSol_(nullptr) {}
FVLocalResidual() : prevSol_(nullptr) {}
//! the constructor for instationary problems
ImplicitLocalResidual(std::shared_ptr<TimeLoop> timeLoop)
FVLocalResidual(std::shared_ptr<TimeLoop> timeLoop)
: timeLoop_(timeLoop)
, prevSol_(nullptr)
{}
......
......@@ -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>
......
......@@ -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/cclocalresidual.hh>
#include <dumux/discretization/cellcentered/globalvolumevariables.hh>
#include <dumux/discretization/cellcentered/subcontrolvolume.hh>
......
......@@ -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/cclocalresidual.hh>
#include <dumux/discretization/cellcentered/connectivitymap.hh>
#include <dumux/discretization/cellcentered/elementsolution.hh>
......
......@@ -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)
#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)
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