From: Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Date: Thu, 23 Oct 2014 15:56:55 +0000 (+0200)
Subject: Merge branch 'multichain' of mmka:unres into multichain
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=4d788798cc98884901de55bd9b81f32ea40e986b;hp=c1b8e24ad8ccf66d0617b0055089ea0c1193840d;p=unres.git

Merge branch 'multichain' of mmka:unres into multichain
---

diff --git a/source/unres/src_MD-M/stochfric.F b/source/unres/src_MD-M/stochfric.F
index 13d02fb..10531b4 100644
--- a/source/unres/src_MD-M/stochfric.F
+++ b/source/unres/src_MD-M/stochfric.F
@@ -365,7 +365,7 @@ c  Load the friction coefficients corresponding to peptide groups
 c  Load the friction coefficients corresponding to side chains
       m=nct-nnt
       ind=0
-      gamsc(ntyp1)=1.0d0
+C      gamsc(ntyp1)=1.0d0
       do i=nnt,nct
         ind=ind+1
         ii = ind+m
diff --git a/source/xdrfpdb/src-M/xdrf2pdb.F b/source/xdrfpdb/src-M/xdrf2pdb.F
index c87e9ff..ff7e1f6 100644
--- a/source/xdrfpdb/src-M/xdrf2pdb.F
+++ b/source/xdrfpdb/src-M/xdrf2pdb.F
@@ -106,18 +106,22 @@
        call xdrffloat(ixdrf, potE, iret)
        call xdrffloat(ixdrf, uconst, iret)
        print *,"potE",potE," uconst",uconst
-#ifdef NEWUNRES
-       call xdrffloat(ixdrf, uconst_back, iret)
-#endif
-       print *,"uconst_back",uconst_back
        call xdrffloat(ixdrf, t_bath, iret)
        print *,"t_bath",t_bath
+C#ifdef NEWUNRES
+       call xdrffloat(ixdrf, uconst_back, iret)
+C#endif
+       print *,"uconst_back",uconst_back
+C       call xdrffloat(ixdrf, t_bath, iret)
+C       print *,"t_bath",t_bath
        call xdrfint(ixdrf, nss, iret) 
        do j=1,nss
         call xdrfint(ixdrf, ihpb(j), iret)
         call xdrfint(ixdrf, jhpb(j), iret)
        enddo
        print *,"nss",nss
+C       call xdrffloat(ixdrf, t_bath, iret)
+C       print *,"t_bath",t_bath
        call xdrfint(ixdrf, nfrag, iret)
        do i=1,nfrag
         call xdrffloat(ixdrf, qfrag(i), iret)
@@ -150,7 +154,7 @@ c       write (*,'(8f10.5)') ((coord(k,j),k=1,3),j=1,isize)
            enddo
          enddo
          etot=potE
-         write (tytul,'(a,i6)') "Structure",kk
+         write (tytul,'(a,i6,a,f8.3)') "Structure",kk,"Temp",t_bath
          call pdbout(etot,tytul,9)
        endif
       enddo