unres_package_Oct_2016 from emilial

[unres4.git] / source / unres / regularize.f90

diff --git a/source/unres/regularize.f90 b/source/unres/regularize.f90
index 061cf44..0eb81e5 100644 (file)
--- a/source/unres/regularize.f90
+++ b/source/unres/regularize.f90
@@ -3,12 +3,12 @@
       use io_units
       use geometry_data
       use energy_data
-#ifndef WHAM_RUN
+#if .not. defined WHAM_RUN && .not. defined CLUSTER
       use minim_data, only: maxfun,rtolf
 #endif
       implicit none
       contains
-#ifndef WHAM_RUN
+#if .not. defined WHAM_RUN && .not. defined CLUSTER
 !-----------------------------------------------------------------------------
 ! regularize.F
 !-----------------------------------------------------------------------------
@@ -487,7 +487,7 @@
    10 c(i,j)=c(i,j)+a(i,k)*b(k,j)                                        
       return
       end subroutine mmmul
-#ifndef WHAM_RUN
+#if .not. defined WHAM_RUN || .not. defined CLUSTER
 !-----------------------------------------------------------------------------
       subroutine matvec(uvec,tmat,pvec,nback)