X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2Fenergy_p_new.F;h=2dc4aa73f8385a84c46c11f0fda4880445cd9170;hb=d5d23fd0abb6c6a3f4ea6b09b89ffbbfe5713236;hp=003cb2f0cd0dde6e70b3373d9f7bb2ca4633e95c;hpb=24bf2425f244c8aa7b1e388fb012b2b86e50b462;p=unres.git

diff --git a/source/wham/src/energy_p_new.F b/source/wham/src/energy_p_new.F
index 003cb2f..2dc4aa7 100644
--- a/source/wham/src/energy_p_new.F
+++ b/source/wham/src/energy_p_new.F
@@ -3104,7 +3104,7 @@ c
       include 'COMMON.FFIELD'
       include 'COMMON.CONTROL'
       double precision u(3),ud(3)
-      lprn=.false.
+      logical :: lprn=.false.
       estr=0.0d0
       do i=nnt+1,nct
         diff = vbld(i)-vbldp0
@@ -4601,6 +4601,12 @@ c   3 = SC...Ca...Ca...SCi
           cosphi=dcos(j*tauangle(intertyp,i))
           sinphi=dsin(j*tauangle(intertyp,i))
           esccor=esccor+v1ij*cosphi+v2ij*sinphi
+<<<<<<< HEAD
+=======
+#ifdef DEBUG
+          esccor_ii=esccor_ii+v1ij*cosphi+v2ij*sinphi
+#endif
+>>>>>>> 3d6f9e7... Adam's changes to wham and cluster following previous commit
           gloci=gloci+j*(v2ij*cosphi-v1ij*sinphi)
         enddo
         gloc_sc(intertyp,i-3,icg)=gloc_sc(intertyp,i-3,icg)+wsccor*gloci