Merge branch 'multichain' of mmka:unres into multichain
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Mon, 6 Jul 2015 09:21:26 +0000 (11:21 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Mon, 6 Jul 2015 09:21:26 +0000 (11:21 +0200)
source/unres/src_MD-M/energy_p_new_barrier.F

index d4465f6..439fb81 100644 (file)
@@ -3069,10 +3069,13 @@ C changes suggested by Ana to avoid out of bounds
      & .or.((i-1).le.0)
 C end of changes by Ana
      &  .or. itype(i+2).eq.ntyp1
-     &  .or. itype(i+3).eq.ntyp1
-     &  .or. itype(i-1).eq.ntyp1
-     &  .or. itype(i+4).eq.ntyp1
-     &  ) cycle
+     &  .or. itype(i+3).eq.ntyp1) cycle
+        if(i.gt.1)then
+          if(itype(i-1).eq.ntyp1)cycle
+        end if
+        if(i.LT.nres-3)then
+          if (itype(i+4).eq.ntyp1) cycle
+        end if
         dxi=dc(1,i)
         dyi=dc(2,i)
         dzi=dc(3,i)