X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2Freadrtns.F;h=af416e8bf70e6e45c788e47968138a32b4eccec7;hb=c1b8e24ad8ccf66d0617b0055089ea0c1193840d;hp=332a2f7dde18e0a9dccbe1394e7d83ad12585433;hpb=62fe06d61bc188d9cda760c882e237aa472e47dc;p=unres.git

diff --git a/source/unres/src_MD/readrtns.F b/source/unres/src_MD/readrtns.F
index 332a2f7..af416e8 100644
--- a/source/unres/src_MD/readrtns.F
+++ b/source/unres/src_MD/readrtns.F
@@ -860,6 +860,10 @@ C 12/1/95 Added weight for the multi-body term WCORR
       call reada(weightcard,"V2SS",v2ss,7.61d0)
       call reada(weightcard,"V3SS",v3ss,13.7d0)
       call reada(weightcard,"EBR",ebr,-5.50D0)
+      call reada(weightcard,"DTRISS",dtriss,1.0D0)
+      call reada(weightcard,"ATRISS",atriss,0.3D0)
+      call reada(weightcard,"BTRISS",btriss,0.02D0)
+      call reada(weightcard,"CTRISS",ctriss,1.0D0)
       dyn_ss=(index(weightcard,'DYN_SS').gt.0)
       do i=1,maxres
         dyn_ss_mask(i)=.false.
@@ -940,8 +944,8 @@ C 10/03/12 Adam: Recalculate coordinates with new side chain positions
          call chainbuild
         endif  
 C Following 2 lines for diagnostics; comment out if not needed
-        write (iout,*) "After sideadd"
-        call intout
+c        write (iout,*) "After sideadd"
+c        call intout
       endif
       if (indpdb.eq.0) then
 C Read sequence if not taken from the pdb file.
@@ -972,9 +976,9 @@ c      print *,nres
 c      print '(20i4)',(itype(i),i=1,nres)
       do i=1,nres
 #ifdef PROCOR
-        if (itype(i).eq.21 .or. itype(i+1).eq.21) then
+        if (itype(i).eq.ntyp1 .or. itype(i+1).eq.ntyp1) then
 #else
-        if (itype(i).eq.21) then
+        if (itype(i).eq.ntyp1) then
 #endif
           itel(i)=0
 #ifdef PROCOR
@@ -1037,8 +1041,8 @@ C 8/13/98 Set limits to generating the dihedral angles
 #endif
       nct=nres
 cd      print *,'NNT=',NNT,' NCT=',NCT
-      if (itype(1).eq.21) nnt=2
-      if (itype(nres).eq.21) nct=nct-1
+      if (itype(1).eq.ntyp1) nnt=2
+      if (itype(nres).eq.ntyp1) nct=nct-1
       if (pdbref) then
         if(me.eq.king.or..not.out1file)
      &   write (iout,'(a,i3)') 'nsup=',nsup
@@ -1357,7 +1361,8 @@ C Check whether the specified bridging residues are cystines.
 C Read preformed bridges.
       if (ns.gt.0) then
       read (inp,*) nss,(ihpb(i),jhpb(i),i=1,nss)
-      write (iout,*) 'nss=',nss,' ihpb,jhpb: ',(ihpb(i),jhpb(i),i=1,nss)
+      if(fg_rank.eq.0)
+     & write(iout,*)'nss=',nss,' ihpb,jhpb: ',(ihpb(i),jhpb(i),i=1,nss)
       if (nss.gt.0) then
         nhpb=nss
 C Check if the residues involved in bridges are in the specified list of
@@ -1951,7 +1956,12 @@ c----------------------------------------------------------------------------
       do i=1,dim
         tablica(i)=default
       enddo
+#ifdef G77
+      aux=lancuch(:ilen(lancuch))//"="	
+      iread=index(rekord,aux)
+#else
       iread=index(rekord,lancuch(:ilen(lancuch))//"=")
+#endif
       if (iread.eq.0) return
       iread=iread+ilen(lancuch)+1
       read (rekord(iread:),*,end=10,err=10) (tablica(i),i=1,dim)
@@ -1969,7 +1979,12 @@ c----------------------------------------------------------------------------
       do i=1,dim
         tablica(i)=default
       enddo
+#ifdef G77
+      aux=lancuch(:ilen(lancuch))//"="
+      iread=index(rekord,aux)
+#else
       iread=index(rekord,lancuch(:ilen(lancuch))//"=")
+#endif
       if (iread.eq.0) return
       iread=iread+ilen(lancuch)+1
       read (rekord(iread:),*,end=10,err=10) (tablica(i),i=1,dim)
@@ -2485,7 +2500,7 @@ c        write (iout,*) i,ifrag_(1,i),ifrag_(2,i),wfrag_(i)
         if (wfrag_(i).gt.0.0d0) then
         do j=ifrag_(1,i),ifrag_(2,i)-1
           do k=j+1,ifrag_(2,i)
-            write (iout,*) "j",j," k",k
+c            write (iout,*) "j",j," k",k
             ddjk=dist(j,k)
             if (constr_dist.eq.1) then
             nhpb=nhpb+1
@@ -2610,12 +2625,14 @@ c------------------------------------------------------------------------------
       include "DIMENSIONS"
       include "COMMON.IOUNITS"
       character*(*) source
+      character* 256 tmpfile
       integer ilen
       external ilen
+      tmpfile=source(:ilen(source))
       write (*,*) "Moving ",source(:ilen(source)),
      & " from temporary directory to working directory"
-      write (*,*) "/bin/mv "//source(:ilen(source))//" "//curdir
-      call system("/bin/mv "//source(:ilen(source))//" "//curdir)
+      write (*,*) "/bin/mv "//tmpfile//" "//curdir
+      call system("/bin/mv "//tmpfile//" "//curdir)
       return
       end
 c------------------------------------------------------------------------------