minor fixes

Author: pancetta

pySDC/core/Controller.py

@@ -196,6 +196,8 @@ def check_convergence(S):
         # get residual and check against prescribed tolerance (plus check number of iterations
         res = L.status.residual
         converged = S.status.iter >= S.params.maxiter or res <= L.params.restol or S.status.force_done
+        if converged is None:
+            converged = False
 
         return converged
 

pySDC/implementations/sweeper_classes/imex_1st_order.py

@@ -50,10 +50,10 @@ def integrate(self):
 
         # integrate RHS over all collocation nodes
         for m in range(1, self.coll.num_nodes + 1):
+            me.append(L.dt * self.coll.Qmat[m, 1] * (L.f[1].impl + L.f[1].expl))
             # new instance of dtype_u, initialize values with 0
-            me.append(P.dtype_u(P.init, val=0.0))
-            for j in range(1, self.coll.num_nodes + 1):
-                me[-1] += L.dt * self.coll.Qmat[m, j] * (L.f[j].impl + L.f[j].expl)
+            for j in range(2, self.coll.num_nodes + 1):
+                me[m - 1] += L.dt * self.coll.Qmat[m, j] * (L.f[j].impl + L.f[j].expl)
 
         return me
 

pySDC/playgrounds/parallel/howto_scorep.txt

@@ -1,14 +1,34 @@
-module load CubeGUI
-module load CubeLib
-module load Vampir
+module load Intel ParaStationMPI SciPy-Stack petsc4py mpi4py FFTW JUBE
+module load Scalasca CubeLib CubeGUI Vampir PAPI
+module unload Score-P
 
-export PATH=/p/project/ccstma/scorep/5.0-trunk_mprobefix_intel-prarstation-papi/bin:$PATH
+NICHT Score-P LADEN!
 
-module load Intel ParaStationMPI SciPy-Stack petsc4py mpi4py FFTW JUBE
 
-srun python -m scorep --mpi pySDC_with_PETSc.py 1
+Bindings bauen:
 
-export SCOREP_PROFILING_MAX_CALLPATH_DEPTH=90
+cd $PROJECT/tools/scorep_binding_python-master
+export PATH=/p/project/ccstma/scorep/6.0-trunk-mrobefix_intel-parastation-papi/bin:$PATH
+pip install --user .
+
+
+Im Jobscript:
+
+export PATH=/p/project/ccstma/scorep/6.0-trunk-mrobefix_intel-parastation-papi/bin:$PATH
 
+export SCOREP_PROFILING_MAX_CALLPATH_DEPTH=90
 export SCOREP_ENABLE_TRACING=1
 export SCOREP_TOTAL_MEMORY=256M
+export SCOREP_EXPERIMENT_DIRECTORY=mydir
+
+srun python -m scorep --mpi pySDC_with_PETSc.py -n N
+srun scout.mpi --time-correct $SCOREP_EXPERIMENT_DIRECTORY/traces.otf2
+
+
+Ablauf:
+
+* Starte Job ohne Tracing (export SCOREP_ENABLE_TRACING=0), nur Profiling
+* scorep-score -c N <SCOREP_EXPERIMENT_DIRECTORY>/profile.cubex
+* Dann check memory requirements, restart Job mit Tracing (export SCOREP_ENABLE_TRACING=1)
+* scout schon im Jobscript?
+* square <SCOREP_EXPERIMENT_DIRECTORY>