X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2Fenecalc1.F;h=a7db9bf8ba69bef5dd867790a917d9963403154a;hb=e85035720a1bc8328949e1c2730d8b229304851c;hp=b4de54c39e9466d07d41a069b7d2897d95602dab;hpb=bec8e01821360e63bb9482c6c97c18fee3e97dc4;p=unres.git

diff --git a/source/wham/src-M/enecalc1.F b/source/wham/src-M/enecalc1.F
index b4de54c..a7db9bf 100644
--- a/source/wham/src-M/enecalc1.F
+++ b/source/wham/src-M/enecalc1.F
@@ -717,7 +717,7 @@ c------------------------------------------------------------------------------
       endif
       call int_from_cart1(.false.)
       do j=nnt+1,nct
-        if (itype(j-1).ne.21 .and. itype(j).ne.21 .and. 
+        if (itype(j-1).ne.ntyp1 .and. itype(j).ne.ntyp1 .and. 
      &    (vbld(j).lt.2.0d0 .or. vbld(j).gt.5.0d0)) then
           if (iprint.gt.0) 
      &    write (iout,*) "Bad CA-CA bond length",j," ",vbld(j),
@@ -742,7 +742,7 @@ c------------------------------------------------------------------------------
       enddo
       do j=nnt,nct
         itj=itype(j)
-        if (itype(j).ne.10 .and.itype(j).ne.21 .and. 
+        if (itype(j).ne.10 .and.itype(j).ne.ntyp1 .and. 
      &     (vbld(nres+j)-dsc(iabs(itj))).gt.2.0d0) then
           if (iprint.gt.0) 
      &    write (iout,*) "Bad CA-SC bond length",j," ",vbld(nres+j),