X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Fwham%2Fsrc%2Fcxread.F;h=d7dcbf8b52d16a7d551175773a839afe5a9ae995;hb=12cbc12a29258591c69825ec212046c31733e5a2;hp=0e6c52e7fa67c6b01454b5b0de9699f95bb3cc82;hpb=c2b5c2a1de9cca14f60446937085424047097953;p=unres.git

diff --git a/source/wham/src/cxread.F b/source/wham/src/cxread.F
index 0e6c52e..d7dcbf8 100644
--- a/source/wham/src/cxread.F
+++ b/source/wham/src/cxread.F
@@ -5,6 +5,7 @@
       include 'DIMENSIONS.FREE'
       integer MaxTraj
       parameter (MaxTraj=2050)
+      include 'COMMON.CONTROL'
       include 'COMMON.CHAIN'
       include 'COMMON.INTERACT'
       include 'COMMON.NAMES'
@@ -17,7 +18,8 @@
       include 'COMMON.VAR'
       include 'COMMON.GEO'
       include 'COMMON.PROT'
-      character*64 nazwa,bprotfile_temp
+      character*64 nazwa
+      character*128 bprotfile_temp
       real*4 rtime,rpotE,ruconst,rt_bath,rprop(maxQ)
       double precision time
       integer iret,itmp,itraj,ntraj
@@ -71,16 +73,19 @@ c      print *,"bumbum"
 #endif
       do j=1,nss
        if (dyn_ss) then
-        call xdrfint_(ixdrf, idssb(j)+nres, iret)
-        call xdrfint_(ixdrf, jdssb(j)+nres, iret)
+        call xdrfint_(ixdrf, idssb(j), iret)
+        call xdrfint_(ixdrf, jdssb(j), iret)
+       idssb(j)=idssb(j)-nres
+       jdssb(j)=jdssb(j)-nres
        else
         call xdrfint_(ixdrf, ihpb(j), iret)
         call xdrfint_(ixdrf, jhpb(j), iret)
        endif
       enddo
       call xdrfint_(ixdrf, nprop, iret)
-      if (umbrella(iparm) .or. read_iset(iparm) .or. hamil_rep) 
-     &  call xdrfint(ixdrf, iset, iret)
+      if (umbrella(iparm) .or. homol_nset.gt.1 .or. read_iset(iparm) 
+     &  .or. hamil_rep) 
+     &  call xdrfint_(ixdrf, iset, iret)
       do i=1,nprop
         call xdrffloat_(ixdrf, rprop(i), iret)
       enddo
@@ -102,8 +107,11 @@ c      print *,"bumbum"
 #endif
       do j=1,nss
        if (dyn_ss) then
-        call xdrfint(ixdrf, idssb(j)+nres, iret)
-        call xdrfint(ixdrf, jdssb(j)+nres, iret)
+        call xdrfint(ixdrf, idssb(j), iret)
+        call xdrfint(ixdrf, jdssb(j), iret)
+cc        idssb(j)=idssb(j)-nres
+cc        jdssb(j)=jdssb(j)-nres
+cc        write(iout,*) idssb(j),jdssb(j)
        else
         call xdrfint(ixdrf, ihpb(j), iret)
         call xdrfint(ixdrf, jhpb(j), iret)
@@ -119,7 +127,8 @@ c      write (iout,*) "nprop",nprop
         nprop_prev=nprop
       endif
       call flush(iout)
-      if (umbrella(iparm) .or. read_iset(iparm) .or. hamil_rep) 
+      if (umbrella(iparm) .or. homol_nset.gt.1 .or. read_iset(iparm) 
+     &  .or. hamil_rep) 
      &  call xdrfint(ixdrf, iset, iret)
       do i=1,nprop
         call xdrffloat(ixdrf, rprop(i), iret)
@@ -249,7 +258,7 @@ c            write (iout,*) "Opening file ",
 c     &          bprotfile_temp(:ilen(bprotfile_temp))
             islice1=islice
           endif
-          if (umbrella(iparm)) then
+          if (umbrella(iparm) .or. homol_nset.gt.1) then
             write(ientout,rec=ll(islice))
      &        ((xoord(l,k),l=1,3),k=1,nres),
      &        ((xoord(l,k),l=1,3),k=nres+1,nres+nct-nnt+1),
@@ -272,6 +281,8 @@ c     &          bprotfile_temp(:ilen(bprotfile_temp))
      &        iR,iib,iparm
           endif
 #ifdef DEBUG
+          write (iout,*) " constr_homology",constr_homology,
+     &      " ll",ll(islice)," iset",iset
           call int_from_cart1(.false.)
           write (iout,*) "Writing conformation, record",ll(islice)
           write (iout,*) "Cartesian coordinates"