Change threading to bool variable.

dune/fem-dg/solver/dg.hh

@@ -80,7 +80,7 @@ namespace Fem
 
     static constexpr bool symmetric  =  false ;
     static constexpr bool matrixfree =  true  ;
-    static constexpr bool threading  = Additional::nThreads > 1 ;
+    static constexpr bool threading  = Additional::threading;
 
     typedef DGAdvectionFlux< ModelType, advFluxId >       AdvectionFluxType;
     typedef typename DiffusionFluxSelector< ModelType, DiscreteFunctionSpaceType, diffFluxId, formId >::type  DiffusionFluxType;
@@ -121,7 +121,7 @@ namespace Fem
         rkSolver_( tp_, fullOperator_, explOperator_, implOperator_, name() ),
         initialized_( false )
     {
-      Dune::Fem::Parameter::append("fem.parallel.numberofthreads", std::to_string( Additional::nThreads ) );
+      //Dune::Fem::Parameter::append("fem.parallel.numberofthreads", std::to_string( Additional::nThreads ) );
 
       const double maxTimeStep = param.maxTimeStep();
       fixedTimeStep_ = param.fixedTimeStep();
@@ -155,7 +155,7 @@ namespace Fem
         rkSolver_( tp_, fullOperator_, explOperator_, implOperator_, name() ),
         initialized_( false )
     {
-      Dune::Fem::Parameter::append("fem.parallel.numberofthreads", std::to_string( Additional::nThreads ) );
+      //Dune::Fem::Parameter::append("fem.parallel.numberofthreads", std::to_string( Additional::nThreads ) );
       std::cout << "cfl = " << double(tp_.factor()) << " " << tp_.time() << std::endl;
     }
 

pydemo/euler/main.py

@@ -10,11 +10,12 @@ dim = 2
 gamma = 1.4
 
 parameter.append({"fem.verboserank": -1})
+parameter.append({"fem.parallel.numberofthreads": 4})
 parameter.append("parameter")
 
 primitive=lambda Model,uh: {"pressure":Model.toPrim(uh)[2]}
 
 run(*problem(),
-        startLevel=0, polOrder=2, limiter="default",
-        primitive=primitive, saveStep=0.1, subsamp=2,
-        dt=None)
+    startLevel=0, polOrder=2, limiter="default",
+    primitive=primitive, saveStep=0.1, subsamp=2,
+    dt=None)

python/dune/femdg/_operators.py

@@ -154,7 +154,7 @@ def generateMethod(struct,expr, cppType, name,
 # create DG operator + solver (limiter = none,minmod,vanleer,superbee),
 # (diffusionScheme = cdg2,br2,ip,nipg,...)
 def createFemDGSolver(Model, space,
-        limiter="minmod", diffusionScheme = "cdg2", nThreads=1 ):
+        limiter="minmod", diffusionScheme = "cdg2", threading=False ):
     import dune.create as create
 
     if limiter is None or limiter is False:
@@ -414,7 +414,7 @@ def createFemDGSolver(Model, space,
         Variable("const bool", "hasFlux"), initializer=hasAdvFlux or hasDiffFlux,
         static=True)])
     struct.append([Declaration(
-        Variable("const int", "nThreads"), initializer=nThreads,
+        Variable("const bool", "threading"), initializer=threading,
         static=True)])
 
     ###################################################

python/dune/femdg/testing.py

@@ -20,7 +20,7 @@ def run(Model, initial, x0,x1,N, endTime, name, exact,
 
     space = create.space("dgonb", grid, order=polOrder, dimrange=dimR)
     u_h = space.interpolate(initial, name='u_h')
-    operator = createFemDGSolver( Model, space, limiter=limiter )
+    operator = createFemDGSolver( Model, space, limiter=limiter, threading=True )
     operator.applyLimiter( u_h );
     print("number of elements: ",grid.size(0),flush=True)
     if saveStep is not None: