delete llf2 flux selection

dune/fem-dg/examples/navierstokes/algorithmcreator.hh

@@ -62,7 +62,7 @@ namespace Fem
                                      Solver::Enum::fem,
                                      AdvectionLimiter::Enum::unlimited,
                                      Matrix::Enum::matrixfree,
-                                     AdvectionFlux::Enum::euler_llf2,
+                                     AdvectionFlux::Enum::llf,
                                      PrimalDiffusionFlux::Enum::general > AC;
 
       typedef typename AC::GridType                                 GridType;

dune/fem-dg/operator/fluxes/advection/parameters.hh

@@ -39,19 +39,17 @@ namespace Fem
       euler_hll = 5,
       //! the HLLC flux
       euler_hllc = 6,
-      //! the local Lax-Friedrichs flux
-      euler_llf2 = 7,
       //! general flux: Parameter selection is done via parameter file!
-      euler_general = 8
+      euler_general = 7
 
     };
 
     //! Contains all known enums for advection fluxes which can be chosen via parameter file.
-    const Enum        _enums[] = { Enum::none, Enum::upwind, Enum::llf, Enum::euler_llf, Enum::euler_hll, Enum::euler_hllc, Enum::euler_llf2 };
+    const Enum        _enums[] = { Enum::none, Enum::upwind, Enum::llf, Enum::euler_llf, Enum::euler_hll, Enum::euler_hllc };
     //! Contains all known names of advection fluxes which can be chosen via parameter file.
-    const std::string _strings[] = { "NONE", "UPWIND" , "LLF", "EULER-LLF", "EULER-HLL" , "EULER-HLLC", "EULER-LLF2" };
+    const std::string _strings[] = { "NONE", "UPWIND" , "LLF", "EULER-LLF", "EULER-HLL" , "EULER-HLLC" };
     //! Number of known advection fluxes which can be chosen via parameter file.
-    static const int  _size = 7;
+    static const int  _size = 6;
 
   }
 

dune/fem-dg/operator/fluxes/euler/fluxes.hh

@@ -84,28 +84,6 @@ namespace Fem
     static std::string name () { return "HLLC (Dennis)"; }
   };
 
-  /**
-   * \brief class specialization for the local Lax-Friedrichs flux.
-   *
-   * The purpose of this class is to allow the selection of an Euler flux
-   * via an enum given in AdvectionFlux::Enum.
-   */
-  template< class Model >
-  class DGAdvectionFlux< Model, AdvectionFlux::Enum::euler_llf2 >
-    : public EulerLLFFlux< Model >
-  {
-    typedef EulerLLFFlux< Model >  BaseType;
-  public:
-    typedef typename BaseType::ParameterType          ParameterType;
-    typedef typename BaseType::IdEnum                 IdEnum;
-    typedef typename BaseType::ModelType              ModelType;
-
-    DGAdvectionFlux( const Model& mod, const ParameterType& param = ParameterType() )
-      : BaseType( mod, param )
-    {}
-    static std::string name () { return "LLF"; }
-  };
-
   /**
    * \brief class specialization for a general flux chosen by a parameter file.
    *
@@ -142,8 +120,7 @@ namespace Fem
         method_( parameters.getMethod() ),
         flux_llf_( mod ),
         flux_hll_( mod ),
-        flux_hllc_( mod ),
-        flux_llf2_( mod )
+        flux_hllc_( mod )
     {}
 
     /**
@@ -173,8 +150,6 @@ namespace Fem
           return flux_hll_.numericalFlux( left, right, uLeft, uRight, jacLeft, jacRight, gLeft, gRight );
         case IdEnum::euler_hllc:
           return flux_hllc_.numericalFlux( left, right, uLeft, uRight, jacLeft, jacRight, gLeft, gRight );
-        case IdEnum::euler_llf2:
-          return flux_llf2_.numericalFlux( left, right, uLeft, uRight, jacLeft, jacRight, gLeft, gRight );
       }
       assert( false );
       std::cerr << "Error: Advection flux not chosen via parameter file" << std::endl;
@@ -186,7 +161,6 @@ namespace Fem
     DGAdvectionFlux< ModelImp, IdEnum::euler_llf >  flux_llf_;
     DGAdvectionFlux< ModelImp, IdEnum::euler_hll >  flux_hll_;
     DGAdvectionFlux< ModelImp, IdEnum::euler_hllc > flux_hllc_;
-    DGAdvectionFlux< ModelImp, IdEnum::euler_llf2 > flux_llf2_;
 
   };