diff --git a/dune/fem-dg/examples/euler/algorithmcreator.hh b/dune/fem-dg/examples/euler/algorithmcreator.hh index b8acfee19917c30470f3a15d436e47af19e83882..90a001c0736acf8abd60037d4eb206008e8803d6 100644 --- a/dune/fem-dg/examples/euler/algorithmcreator.hh +++ b/dune/fem-dg/examples/euler/algorithmcreator.hh @@ -55,11 +55,11 @@ namespace Fem typedef AlgorithmConfigurator< GridImp, Galerkin::Enum::dg, Adaptivity::Enum::yes, - DiscreteFunctionSpaces::Enum::legendre, + DiscreteFunctionSpaces::Enum::orthonormal, Solver::Enum::fem, AdvectionLimiter::Enum::limited, Matrix::Enum::matrixfree, - AdvectionFlux::Enum::upwind, + AdvectionFlux::Enum::euler_hll, PrimalDiffusionFlux::Enum::general > AC; // define problem type here if interface should be avoided diff --git a/dune/fem-dg/examples/euler/models.hh b/dune/fem-dg/examples/euler/models.hh index 624aa10befa0345c027d0cfd00f3336ea58630e0..ad9da7f02681e404615eda88cb75bbedb7711ece 100644 --- a/dune/fem-dg/examples/euler/models.hh +++ b/dune/fem-dg/examples/euler/models.hh @@ -290,21 +290,6 @@ namespace Fem const double gamma_; - /** - * \brief velocity calculation - */ - template <class LocalEvaluation> - inline DomainType velocity(const LocalEvaluation& local) const - { - //TODO CHECK THIS!!! - DomainType v; - for(int i=0; i<dimDomain; ++i) - v[i] *= std::get<0>(local.values().template at< uVar>())[i]; - v *= EulerAnalyticalFlux<dimDomain>().rhoeps( std::get<0>(local.values().template at< uVar>() ) ); - return v; - } - - ///////////////////////////////////////////////////////////////// // Limiter section //////////////////////////////////////////////////////////////// @@ -316,6 +301,7 @@ namespace Fem { for(int i=0; i<dimDomain; ++i) { + // U = (rho, rho v_0,...,rho v_(d-1), e ) // we store \rho u but do not need to divide by \rho here since only // sign is needed. velocity[i] = u[i+1]; diff --git a/dune/fem-dg/examples/euler/problems.hh b/dune/fem-dg/examples/euler/problems.hh index 5c3a1b1d9e285568797b52fa1a5d1d2a3d18266f..422af3df05a14303eef8a9e60b0922cb8cd6cb93 100644 --- a/dune/fem-dg/examples/euler/problems.hh +++ b/dune/fem-dg/examples/euler/problems.hh @@ -20,7 +20,9 @@ namespace Fem const int problemNumber = Fem :: Parameter :: getEnum ( "problem" , problemNames ); if( problemNames[ problemNumber ] == "sod" ) - return new U0Sod< GridImp > ( ); + { + return new U0Sod< GridImp >(); + } else if( problemNames[ problemNumber ] == "smooth1d" ) return new U0Smooth1D< GridImp > (); else if( problemNames[ problemNumber ] == "ffs" ) diff --git a/dune/fem-dg/examples/grids/grid2d_str1d.dgf b/dune/fem-dg/examples/grids/grid2d_str1d.dgf index 2a11285f6b47e05140b5a4d0dbce6afaa91d4c62..8b40afb359ed19778da7cc72ed397ce0a81f4893 100644 --- a/dune/fem-dg/examples/grids/grid2d_str1d.dgf +++ b/dune/fem-dg/examples/grids/grid2d_str1d.dgf @@ -6,10 +6,10 @@ Interval %16 4 # -PERIODICFACETRANSFORMATION -% set periodic boundaries in x direction -1 0, 0 1 + 0 0.25 -# +%PERIODICFACETRANSFORMATION +%% set periodic boundaries in x direction +%1 0, 0 1 + 0 0.25 +%# GRIDPARAMETER overlap 1