!local variables el
integer :: i,j,k,l,ichir1,ichir2,iblock,m,maxit
-#if .not. defined(WHAM_RUN) && .not. defined(CLUSTER)
+!#if .not. defined(WHAM_RUN) && .not. defined(CLUSTER)
mask_r=.false.
#ifndef ISNAN
! NaNQ initialization
#endif
#endif
+#if !defined(WHAM_RUN) && !defined(CLUSTER)
kdiag=0
icorfl=0
iw=2
! timlim=batime-150.0
! Calculate the initial time, if it is not zero (e.g. for the SUN).
stime=tcpu()
-#if .not. defined(WHAM_RUN) && .not. defined(CLUSTER)
+#if !defined(WHAM_RUN) && !defined(CLUSTER)
#ifdef MPI
walltime=MPI_WTIME()
time_reduce=0.0d0