X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M%2FMREMD.F;fp=source%2Funres%2Fsrc_MD-M%2FMREMD.F;h=7a72b172dad8b5822861f387591a54e2a57435a6;hp=f29b6b5760e251535747ecd923174fdb860e3bcb;hb=43f81831c5104109960d27982cd0a83d700ea48c;hpb=46f3f544d5a60812e2e11e03b619903f2ed052eb diff --git a/source/unres/src_MD-M/MREMD.F b/source/unres/src_MD-M/MREMD.F index f29b6b5..7a72b17 100644 --- a/source/unres/src_MD-M/MREMD.F +++ b/source/unres/src_MD-M/MREMD.F @@ -572,10 +572,10 @@ C call enerprint(remd_ene(0,i)) endif open(irest2,file=rest2name,status='unknown') write(irest2,*) totT,EK,potE,totE,t_bath - do i=1,2*nres + do i=0,2*nres write (irest2,'(3e15.5)') (d_t(j,i),j=1,3) enddo - do i=1,2*nres + do i=0,2*nres write (irest2,'(3e15.5)') (dc(j,i),j=1,3) enddo if(usampl) then @@ -1232,8 +1232,8 @@ c----------------------------------------------------------------------- include 'COMMON.SBRIDGE' include 'COMMON.INTERACT' - real d_restart1(3,2*maxres*maxprocs),r_d(3,2*maxres), - & d_restart2(3,2*maxres*maxprocs) + real d_restart1(3,2*(maxres+1)*maxprocs),r_d(3,2*(maxres+1)), + & d_restart2(3,2*(maxres+1)*maxprocs) real t5_restart1(5) integer iret,itmp integer*2 i_index @@ -1250,23 +1250,23 @@ c----------------------------------------------------------------------- & t_restart1,5,mpi_real,king,CG_COMM,ierr) - do i=1,2*nres + do i=0,2*nres do j=1,3 r_d(j,i)=d_t(j,i) enddo enddo - call mpi_gather(r_d,3*2*nres,mpi_real, - & d_restart1,3*2*nres,mpi_real,king, + call mpi_gather(r_d,3*2*(nres+1),mpi_real, + & d_restart1,3*2*(nres+1),mpi_real,king, & CG_COMM,ierr) - do i=1,2*nres + do i=0,2*nres do j=1,3 r_d(j,i)=dc(j,i) enddo enddo - call mpi_gather(r_d,3*2*nres,mpi_real, - & d_restart2,3*2*nres,mpi_real,king, + call mpi_gather(r_d,3*2*(nres+1),mpi_real, + & d_restart2,3*2*(nres+1),mpi_real,king, & CG_COMM,ierr) if(me.eq.king) then @@ -1295,16 +1295,18 @@ c----------------------------------------------------------------------- enddo do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres do j=1,3 - call xdrffloat_(ixdrf, d_restart1(j,i+2*nres*il), iret) + call + & xdrffloat_(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) enddo enddo enddo do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres do j=1,3 - call xdrffloat_(ixdrf, d_restart2(j,i+2*nres*il), iret) + call + & xdrffloat_(ixdrf, d_restart2(j,i+2*(nres+1)*il), iret) enddo enddo enddo @@ -1355,16 +1357,18 @@ c----------------------------------------------------------------------- enddo do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres do j=1,3 - call xdrffloat(ixdrf, d_restart1(j,i+2*nres*il), iret) + call + & xdrffloat(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) enddo enddo enddo do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres do j=1,3 - call xdrffloat(ixdrf, d_restart2(j,i+2*nres*il), iret) + call + & xdrffloat(ixdrf, d_restart2(j,i+2*(nres+1)*il), iret) enddo enddo enddo @@ -1631,7 +1635,7 @@ c end debugging include 'COMMON.CHAIN' include 'COMMON.SBRIDGE' include 'COMMON.INTERACT' - real d_restart1(3,2*maxres*maxprocs),r_d(3,2*maxres), + real d_restart1(3,2*(maxres+1)*maxprocs),r_d(3,2*(maxres+1)), & t5_restart1(5) integer*2 i_index & (maxprocs/4,maxprocs/20,maxprocs/200,maxprocs/200) @@ -1707,45 +1711,47 @@ c end debugging if(me.eq.king)then do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres c read(irest2,'(3e15.5)') c & (d_restart1(j,i+2*nres*il),j=1,3) do j=1,3 #ifdef AIX - call xdrffloat_(ixdrf, d_restart1(j,i+2*nres*il), iret) + call xdrffloat_(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) #else - call xdrffloat(ixdrf, d_restart1(j,i+2*nres*il), iret) + call xdrffloat(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) #endif enddo enddo enddo endif - call mpi_scatter(d_restart1,3*2*nres,mpi_real, - & r_d,3*2*nres,mpi_real,king,CG_COMM,ierr) + call mpi_scatter(d_restart1,3*2*(nres+1),mpi_real, + & r_d,3*2*(nres+1),mpi_real,king,CG_COMM,ierr) - do i=1,2*nres + do i=0,2*nres do j=1,3 d_t(j,i)=r_d(j,i) enddo enddo if(me.eq.king)then do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres c read(irest2,'(3e15.5)') c & (d_restart1(j,i+2*nres*il),j=1,3) do j=1,3 #ifdef AIX - call xdrffloat_(ixdrf, d_restart1(j,i+2*nres*il), iret) + call + & xdrffloat_(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) #else - call xdrffloat(ixdrf, d_restart1(j,i+2*nres*il), iret) + call + & xdrffloat(ixdrf, d_restart1(j,i+2*(nres+1)*il), iret) #endif enddo enddo enddo endif - call mpi_scatter(d_restart1,3*2*nres,mpi_real, - & r_d,3*2*nres,mpi_real,king,CG_COMM,ierr) - do i=1,2*nres + call mpi_scatter(d_restart1,3*2*(nres+1),mpi_real, + & r_d,3*2*(nres+1),mpi_real,king,CG_COMM,ierr) + do i=0,2*nres do j=1,3 dc(j,i)=r_d(j,i) enddo @@ -1841,14 +1847,14 @@ c & (d_restart1(j,i+2*nres*il),j=1,3) if(me.eq.king)then do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres read(irest2,'(3e15.5)') - & (d_restart1(j,i+2*nres*il),j=1,3) + & (d_restart1(j,i+2*(nres+1)*il),j=1,3) enddo enddo endif - call mpi_scatter(d_restart1,3*2*nres,mpi_real, - & r_d,3*2*nres,mpi_real,king,CG_COMM,ierr) + call mpi_scatter(d_restart1,3*2*(nres+1),mpi_real, + & r_d,3*2*(nres+1),mpi_real,king,CG_COMM,ierr) do i=1,2*nres do j=1,3 @@ -1857,14 +1863,14 @@ c & (d_restart1(j,i+2*nres*il),j=1,3) enddo if(me.eq.king)then do il=0,nodes-1 - do i=1,2*nres + do i=0,2*nres read(irest2,'(3e15.5)') - & (d_restart1(j,i+2*nres*il),j=1,3) + & (d_restart1(j,i+2*(nres+1)*il),j=1,3) enddo enddo endif - call mpi_scatter(d_restart1,3*2*nres,mpi_real, - & r_d,3*2*nres,mpi_real,king,CG_COMM,ierr) + call mpi_scatter(d_restart1,3*2*(nres+1),mpi_real, + & r_d,3*2*(nres+1),mpi_real,king,CG_COMM,ierr) do i=1,2*nres do j=1,3 dc(j,i)=r_d(j,i)