Merge branch 'develop' of iffgit.fz-juelich.de:fleur/fleur into develop

types/types_enpara.F90

@@ -193,7 +193,7 @@ CONTAINS
              ! Now for the lo's
              DO ilo = 1, atoms%nlo(n)
                 l = atoms%llo(ilo,n)
-                IF( lo_done(ilo,n,jsp)) CALL priv_write(.TRUE.,l,n,jsp,enpara%qn_ello(ilo,n,jsp),elo_lo(l,n),elo_up(l,n),enpara%ello0(ilo,n,jsp))
+                IF( lo_done(ilo,n,jsp)) CALL priv_write(.TRUE.,l,n,jsp,enpara%qn_ello(ilo,n,jsp),elo_lo(ilo,n),elo_up(ilo,n),enpara%ello0(ilo,n,jsp))
              END DO
           END DO
        ENDIF

xc-pot/gaunt.f90

@@ -88,7 +88,7 @@ CONTAINS
       INTRINSIC sqrt
 !     ..
       if (allocated(w)) return
-!$    if (omp_in_parallel()) call juDFT_error("BUG IN GAUNT!!")
+!$    if (omp_in_parallel() .and. omp_get_num_threads() > 1) call juDFT_error("BUG IN GAUNT!!")
       ALLOCATE(w((3*lmaxd)/4+1),yr((3*lmaxd)/4+1,(lmaxd+1)**2))
 
       n = (3*lmaxd)/4+1