Merge branch 'master' into ELPA_GPU

7e2fe927 · Andreas Marek · 2f8836f7 · 34fbaebf · 7e2fe927
Commit 7e2fe927 authored Feb 03, 2016 by Andreas Marek
--- a/src/elpa2_compute.F90
+++ b/src/elpa2_compute.F90
@@ -4027,7 +4027,9 @@ module ELPA2_compute

      if (na <= 0) then
        limits(:) = 0
+#ifdef HAVE_DETAILED_TIMINGS
        call timer%stop("determine_workload")
+#endif
        return
      endif