Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko

[unres.git] / source / unres / src_MD / initialize_p.F

diff --git a/source/unres/src_MD/initialize_p.F b/source/unres/src_MD/initialize_p.F
index ec978e7..18451d6 100644 (file)
--- a/source/unres/src_MD/initialize_p.F
+++ b/source/unres/src_MD/initialize_p.F
@@ -164,8 +164,12 @@ c      call memmon_print_usage()
        rr0(i)=0.0D0
        a0thet(i)=0.0D0
        do j=1,2
-         athet(j,i)=0.0D0
-         bthet(j,i)=0.0D0
+         do k=-1,1
+         do kk=-1,1
+          athet(j,i,k,kk)=0.0D0
+         bthet(j,i,k,kk)=0.0D0
+         enddo
+         enddo
         enddo
        do j=0,3
          polthet(j,i)=0.0D0
@@ -292,11 +296,11 @@ c---------------------------------------------------------------------------
       include 'COMMON.IOUNITS'
       include 'COMMON.DERIV'
       include 'COMMON.CONTACTS'
-      common /przechowalnia/ iturn3_start_all(0:MaxProcs),
-     & iturn3_end_all(0:MaxProcs),iturn4_start_all(0:MaxProcs),
-     & iturn4_end_all(0:MaxProcs),iatel_s_all(0:MaxProcs),
-     & iatel_e_all(0:MaxProcs),ielstart_all(maxres,0:MaxProcs-1),
-     & ielend_all(maxres,0:MaxProcs-1),
+      common /przechowalnia/ iturn3_start_all(0:max_fg_procs),
+     & iturn3_end_all(0:max_fg_procs),iturn4_start_all(0:max_fg_procs),
+     & iturn4_end_all(0:max_fg_procs),iatel_s_all(0:max_fg_procs),
+     &iatel_e_all(0:max_fg_procs),ielstart_all(maxres,0:max_fg_procs-1),
+     & ielend_all(maxres,0:max_fg_procs-1),
      & ntask_cont_from_all(0:max_fg_procs-1),
      & itask_cont_from_all(0:max_fg_procs-1,0:max_fg_procs-1),
      & ntask_cont_to_all(0:max_fg_procs-1),
@@ -345,6 +349,7 @@ cd    write (iout,*) 'ns=',ns,' nss=',nss,' ihpb,jhpb',
 cd   &   (ihpb(i),jhpb(i),i=1,nss)
       do i=nnt,nct-1
         scheck=.false.
+        if (dyn_ss) goto 10
         do ii=1,nss
           if (ihpb(ii).eq.i+nres) then
             scheck=.true.
@@ -1116,15 +1121,16 @@ c---------------------------------------------------------------------------
       include "COMMON.INTERACT"
       include "COMMON.SETUP"
       include "COMMON.IOUNITS"
-      integer ii,jj,itask(4),ntask_cont_to,itask_cont_to(0:MaxProcs-1)
+      integer ii,jj,itask(4),
+     & ntask_cont_to,itask_cont_to(0:max_fg_procs-1)
       logical flag
       integer iturn3_start_all,iturn3_end_all,iturn4_start_all,
      & iturn4_end_all,iatel_s_all,iatel_e_all,ielstart_all,ielend_all
-      common /przechowalnia/ iturn3_start_all(0:MaxProcs),
-     & iturn3_end_all(0:MaxProcs),iturn4_start_all(0:MaxProcs),
-     & iturn4_end_all(0:MaxProcs),iatel_s_all(0:MaxProcs),
-     & iatel_e_all(0:MaxProcs),ielstart_all(maxres,0:MaxProcs-1),
-     & ielend_all(maxres,0:MaxProcs-1)
+      common /przechowalnia/ iturn3_start_all(0:max_fg_procs),
+     & iturn3_end_all(0:max_fg_procs),iturn4_start_all(0:max_fg_procs),
+     & iturn4_end_all(0:max_fg_procs),iatel_s_all(0:max_fg_procs),
+     &iatel_e_all(0:max_fg_procs),ielstart_all(maxres,0:max_fg_procs-1),
+     & ielend_all(maxres,0:max_fg_procs-1)
       integer iproc,isent,k,l
 c Determines whether to send interaction ii,jj to other processors; a given
 c interaction can be sent to at most 2 processors.
@@ -1206,15 +1212,15 @@ c---------------------------------------------------------------------------
       include "COMMON.SETUP"
       include "COMMON.IOUNITS"
       integer ii,jj,itask(2),ntask_cont_from,
-     & itask_cont_from(0:MaxProcs-1)
+     & itask_cont_from(0:max_fg_procs-1)
       logical flag
       integer iturn3_start_all,iturn3_end_all,iturn4_start_all,
      & iturn4_end_all,iatel_s_all,iatel_e_all,ielstart_all,ielend_all
-      common /przechowalnia/ iturn3_start_all(0:MaxProcs),
-     & iturn3_end_all(0:MaxProcs),iturn4_start_all(0:MaxProcs),
-     & iturn4_end_all(0:MaxProcs),iatel_s_all(0:MaxProcs),
-     & iatel_e_all(0:MaxProcs),ielstart_all(maxres,0:MaxProcs-1),
-     & ielend_all(maxres,0:MaxProcs-1)
+      common /przechowalnia/ iturn3_start_all(0:max_fg_procs),
+     & iturn3_end_all(0:max_fg_procs),iturn4_start_all(0:max_fg_procs),
+     & iturn4_end_all(0:max_fg_procs),iatel_s_all(0:max_fg_procs),
+     &iatel_e_all(0:max_fg_procs),ielstart_all(maxres,0:max_fg_procs-1),
+     & ielend_all(maxres,0:max_fg_procs-1)
       integer iproc,k,l
       do iproc=fg_rank+1,nfgtasks-1
         do k=iturn3_start_all(iproc),iturn3_end_all(iproc)
@@ -1266,7 +1272,7 @@ c---------------------------------------------------------------------------
       subroutine add_task(iproc,ntask_cont,itask_cont)
       implicit none
       include "DIMENSIONS"
-      integer iproc,ntask_cont,itask_cont(0:MaxProcs-1)
+      integer iproc,ntask_cont,itask_cont(0:max_fg_procs-1)
       integer ii
       do ii=1,ntask_cont
         if (itask_cont(ii).eq.iproc) return