Merge branch 'devel' into AFM

[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 0f6c732..2eb1489 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
@@ -191,15 +195,17 @@ c      call memmon_print_usage()
       enddo
       nlob(ntyp1)=0
       dsc(ntyp1)=0.0D0
+      do iblock=1,2
       do i=1,maxtor
        itortyp(i)=0
        do j=1,maxtor
          do k=1,maxterm
-           v1(k,j,i)=0.0D0
-           v2(k,j,i)=0.0D0
+           v1(k,j,i,iblock)=0.0D0
+           v2(k,j,i,iblock)=0.0D0
           enddo
         enddo
       enddo
+      enddo
       do i=1,maxres
        itype(i)=0
        itel(i)=0
@@ -312,7 +318,7 @@ C... to deal with by current processor.
         itask_cont_from(i)=fg_rank
         itask_cont_to(i)=fg_rank
       enddo
-      lprint=.false.
+      lprint=energy_dec
       if (lprint)
      &write (iout,*) 'INIT_INT_TABLE nres=',nres,' nnt=',nnt,' nct=',nct
       n_sc_int_tot=(nct-nnt+1)*(nct-nnt)/2-nss
@@ -345,6 +351,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.
@@ -410,6 +417,7 @@ c            write (iout,*) 'jj=nct'
       iatsc_s=nnt
       iatsc_e=nct-1
 #endif
+      if (iatsc_s.eq.0) iatsc_s=1
 #ifdef MPI
       if (lprint) write (*,*) 'Processor',fg_rank,' CG Group',kolor,
      &   ' absolute rank',myrank,' iatsc_s=',iatsc_s,' iatsc_e=',iatsc_e
@@ -542,6 +550,7 @@ cd        write (iout,*) 'i.gt.nct-iscp'
         endif 
       enddo ! i
 #endif
+      if (iatscp_s.eq.0) iatscp_s=1
       if (lprint) then
         write (iout,'(a)') 'SC-p interaction array:'
         do i=iatscp_s,iatscp_e
@@ -1376,6 +1385,7 @@ c------------------------------------------------------------------------------
       include 'COMMON.IOUNITS'
       include 'COMMON.SETUP'
       include 'COMMON.CONTROL'
+c      write(2,*)"hpb_partition: nhpb=",nhpb
 #ifdef MPI
       call int_bounds(nhpb,link_start,link_end)
       if (.not. out1file) 
@@ -1387,5 +1397,6 @@ c------------------------------------------------------------------------------
       link_start=1
       link_end=nhpb
 #endif
+c      write(2,*)"hpb_partition: link_start=",nhpb," link_end=",link_end
       return
       end