Index: wannierise.F90
===================================================================
--- wannierise.F90	(Revision 3933)
+++ wannierise.F90	(Arbeitskopie)
@@ -1295,7 +1295,6 @@
     real(kind=dp) :: summ,mnn2
     real(kind=dp) :: brn
     integer :: ind,nkp,nn,m,n,iw
-    logical, save :: first_pass=.true.
 
     if (timing_level>1) call io_stopwatch('wann: omega',1)
 
@@ -1401,7 +1400,7 @@
 
     ! wann_spread%om_i only needs to be calculated on the first pass
     ! on subsequent passes it may be set to omega_invariant
-    if (first_pass) then
+    if (omega_invariant < 0.0_dp) then ! first pass
        wann_spread%om_i = 0.0_dp  
        do nkp = 1, num_kpts  
           do nn = 1, nntot  
@@ -1417,7 +1416,6 @@
           enddo
        enddo
        wann_spread%om_i = wann_spread%om_i / real(num_kpts,dp)
-       first_pass=.false.
     else 
        wann_spread%om_i=omega_invariant
     endif
@@ -2596,7 +2594,6 @@
     real(kind=dp) :: summ, brn
     real(kind=dp), allocatable :: m_w_nn2(:)
     integer :: ind, nn,m,n,iw, rn, cn, ierr
-    logical, save :: first_pass=.true.
 
     if (timing_level>1) call io_stopwatch('wann: omega_gamma',1)
 
@@ -2649,7 +2646,7 @@
        r2ave(iw) = r2ave(iw) - m_w_nn2(iw) 
     enddo
 
-    if (first_pass) then
+    if (omega_invariant < 0.0_dp) then ! first pass
        summ = 0.0_dp  
        do nn = 1, nntot  
           rn = 2*nn -1
@@ -2661,7 +2658,6 @@
           enddo
        enddo
        wann_spread%om_i = wbtot*real(num_wann,dp) - summ
-       first_pass=.false.
     else 
        wann_spread%om_i=omega_invariant
     endif