Merge branch 'devel' into feature-ga

[unres.git] / source / xdrfpdb / src / xdrf2pdb-m.F

diff --git a/source/xdrfpdb/src/xdrf2pdb-m.F b/source/xdrfpdb/src/xdrf2pdb-m.F
index 0016d40..61893ef 100644 (file)
--- a/source/xdrfpdb/src/xdrf2pdb-m.F
+++ b/source/xdrfpdb/src/xdrf2pdb-m.F
@@ -10,17 +10,18 @@
       character*3 sequenc(maxres)
       character*50 tytul
       character*8 onethree,cfreq,cntraj,citraj
+      character*3 licz
       character*8 ucase
       external ucase
-      logical oneletter
+      logical oneletter,iblnk
       integer rescode
       external rescode
       
       ifreq=1
-      if (iargc().lt.3) then
+      if (iargc().lt.5) then
         print '(2a)',
-     &   "Usage: xdrf2pdb-m one/three seqfile cxfile [freq] [pdbfile] ",
-     &    " [ntraj] [itraj]"
+     &   "Usage: xdrf2pdb-m one/three seqfile cxfile ntraj itraj",
+     &   " [pdbfile] [freq]"
         stop
       endif
       call getarg(1,onethree)
@@ -40,6 +41,7 @@
         nres=i
         i=0
         do while (.not.iblnk(sequenc(i+1)(1:1)))
+c        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0))
           i=i+1
         enddo 
         nres=i
@@ -52,6 +54,7 @@
         nres=i
         i=0
         do while (.not.iblnk(sequenc(i+1)(1:1)))
+c        do while (.not.(iblnk(sequenc(i+1)(1:1)) == 0))
           i=i+1
         enddo 
         nres=i
@@ -59,7 +62,7 @@
           itype(i)=rescode(i,sequenc(i),0)
         enddo
         print *,nres
-        print '(a3,1x)',(sequenc(i),i=1,nres)
+        print '(20(a3,1x))',(sequenc(i),i=1,nres)
       endif
       call getarg(3,arg)
       iext = index(arg,'.cx') - 1
@@ -67,28 +70,21 @@
         print *,"Error - not a cx file"
         stop
       endif
-      if (iargc().gt.3) then
-        call getarg(4,cfreq)
-        read (cfreq,*) ifreq
-      endif
-      if (iargc().gt.4) then
-        call getarg(5,pdbfile)
-      else
-        pdbfile=arg(:iext)//'.pdb'
-      endif
+      call getarg(4,cntraj)
+      read (cntraj,*) ntraj
+      call getarg(5,citraj)
+      read (citraj,*) itraj
       if (iargc().gt.5) then
-        call getarg(6,cntraj)
-        read (cntraj,*) ntraj
+        call getarg(6,pdbfile)
       else
-        ntraj=1
+        write(licz,'(bz,i3.3)') itraj
+        pdbfile=arg(:iext)//'_'//licz//'.pdb'
       endif
       if (iargc().gt.6) then
-        call getarg(7,citraj)
-        read (citraj,*) itraj
-      else
-        itraj=1
+        call getarg(7,cfreq)
+        read (cfreq,*) ifreq
       endif
-      print *,"ifreq",ifreq," ntraj",ntraj," itraj",itraj
+c      print *,"ifreq",ifreq," ntraj",ntraj," itraj",itraj
       open(9,file=pdbfile)
       nnt = 1
       if (itype(1).eq.21) nnt = 2
@@ -103,10 +99,12 @@
        kk = kk + 1
        call xdrffloat(ixdrf, potE, iret)
        call xdrffloat(ixdrf, uconst, iret)
+       call xdrffloat(ixdrf, t_bath, iret)
+       print *,"potE",potE," uconst",uconst," t_bath",t_bath
 #ifdef NEWUNRES
        call xdrffloat(ixdrf, uconst_back, iret)
 #endif
-       call xdrffloat(ixdrf, t_bath, iret)
+       print *,"uconst_back",uconst_back
        call xdrfint(ixdrf, nss, iret) 
        do j=1,nss
         call xdrfint(ixdrf, ihpb(j), iret)
@@ -119,6 +117,7 @@
        prec=10000.0
 
        isize=0
+       print *," call xdrf3coord"
        call xdrf3dfcoord(ixdrf, coord, isize, prec, iret)