Skip to content
Snippets Groups Projects
Commit 8ffd7ab1 authored by Robert Kloefkorn's avatar Robert Kloefkorn
Browse files

make headers compile.

parent f2f8687a
No related branches found
No related tags found
No related merge requests found
......@@ -19,14 +19,14 @@
/**
* @brief Traits class for HeatEqnModel
*/
template <class GridPart >
template <class GridPart, int dimR >
class HeatEqnModelTraits
{
public:
typedef GridPart GridPartType;
typedef typename GridPartType :: GridType GridType;
static const int dimDomain = GridType::dimensionworld;
static const int dimRange = DIMRANGE;
static const int dimRange = dimR;
static const int dimGradRange = dimRange * dimDomain ;
// Definition of domain and range types
typedef Dune::FieldVector< double, dimDomain > DomainType;
......@@ -85,7 +85,8 @@ public:
//
////////////////////////////////////////////////////////
template <class GridPartType,class ProblemImp>
class HeatEqnModel : public DefaultModel < HeatEqnModelTraits< GridPartType > >
class HeatEqnModel :
public DefaultModel < HeatEqnModelTraits< GridPartType,ProblemImp::dimRange > >
{
public:
// for heat equations advection is disabled
......@@ -95,8 +96,8 @@ public:
typedef ProblemImp ProblemType ;
static const int ConstantVelocity = ProblemType :: ConstantVelocity;
typedef typename GridPartType :: GridType GridType;
typedef HeatEqnModelTraits< GridPartType > Traits;
typedef typename GridPartType :: GridType GridType;
typedef HeatEqnModelTraits< GridPartType,ProblemImp::dimRange > Traits;
static const int dimDomain = Traits :: dimDomain ;
static const int dimRange = Traits :: dimRange ;
typedef typename Traits :: DomainType DomainType;
......@@ -108,8 +109,8 @@ public:
typedef typename Traits :: FaceDomainType FaceDomainType;
typedef typename Traits :: JacobianRangeType JacobianRangeType;
typedef typename Traits :: EntityType EntityType;
typedef typename Traits :: IntersectionType IntersectionType;
typedef typename Traits :: EntityType EntityType;
typedef typename Traits :: IntersectionType IntersectionType;
HeatEqnModel(const HeatEqnModel& otehr);
const HeatEqnModel &operator=(const HeatEqnModel &other);
......
......@@ -2,6 +2,10 @@
#define FEMHOWTO_HEATSTEPPER_HH
#include <config.h>
#ifndef DIMRANGE
#define DIMRANGE 1
#endif
// dune-fem includes
#include <dune/fem/io/parameter.hh>
......@@ -45,19 +49,7 @@ struct ProblemGenerator
static inline std::string advectionFluxName()
{
#if (FLUX==1)
return "LLF";
#elif (FLUX==2)
return "HLL(Dennis)";
#elif (FLUX==3)
return "HLLC(Dennis)";
#elif (FLUX==4)
return "HLL2C";
#elif (FLUX==5)
return "HLL2";
#elif (FLUX==6)
return "HLLEM(Mhd)";
#endif
}
......
......@@ -33,6 +33,11 @@ struct ProblemGenerator
static const Dune :: DGDiffusionFluxIdentifier PrimalDiffusionFluxId
= Dune :: method_general ;
// for header check
#ifndef FLUX
#define FLUX 1
#endif
// ******************************** NUMERICAL FLUX *****************************
#if (FLUX==1)
#warning "FLUX: LLF"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment