Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM

[unres4.git] / source / unres / control.F90

diff --git a/source/unres/control.F90 b/source/unres/control.F90
index 4c413ec..06dfe8c 100644 (file)
--- a/source/unres/control.F90
+++ b/source/unres/control.F90
@@ -148,6 +148,7 @@
 !
 ! The following is just to define auxiliary variables used in angle conversion
 !
+!      ifirstrun=0
       pi=4.0D0*datan(1.0D0)
       dwapi=2.0D0*pi
       dwapi3=dwapi/3.0D0
@@ -246,6 +247,7 @@
       itube=61
 !     IONS
       iion=401
+      iionnucl=402
 #if defined(WHAM_RUN) || defined(CLUSTER)
 !
 ! setting the mpi variables for WHAM
@@ -563,6 +565,7 @@
       iatsc_s=0
       iatsc_e=0
 #endif
+        if(.not.allocated(ielstart_all)) then
 !el       common /przechowalnia/
       allocate(iturn3_start_all(0:nfgtasks))
       allocate(iturn3_end_all(0:nfgtasks))
@@ -578,6 +581,7 @@
       allocate(itask_cont_from_all(0:nfgtasks-1,0:nfgtasks-1))
       allocate(itask_cont_to_all(0:nfgtasks-1,0:nfgtasks-1))
 !el----------
+      endif
 !      lprint=.false.
         print *,"NCT",nct_molec(1),nct
       do i=1,nres !el  !maxres
@@ -1385,11 +1389,14 @@
         call MPI_Type_commit(MPI_UYZGRAD,IERROR)
         call MPI_Type_contiguous(maxcontsshi,MPI_INTEGER,MPI_I50,IERROR)
         call MPI_Type_commit(MPI_I50,IERROR)
-         impishi=maxcontsshi*3
-        call MPI_Type_contiguous(impishi,MPI_DOUBLE_PRECISION, &
-        MPI_SHI,IERROR)
-        call MPI_Type_commit(MPI_SHI,IERROR)
+        call MPI_Type_contiguous(maxcontsshi,MPI_DOUBLE_PRECISION,MPI_D50,IERROR)
+        call MPI_Type_commit(MPI_D50,IERROR)
 
+         impishi=maxcontsshi*3
+!        call MPI_Type_contiguous(impishi,MPI_DOUBLE_PRECISION, &
+!        MPI_SHI,IERROR)
+!        call MPI_Type_commit(MPI_SHI,IERROR)
+!        print *,MPI_SHI,"MPI_SHI",MPI_D50
         call MPI_Type_contiguous(2,MPI_DOUBLE_PRECISION,MPI_MU,IERROR)
         call MPI_Type_commit(MPI_MU,IERROR)
         call MPI_Type_contiguous(4,MPI_DOUBLE_PRECISION,MPI_MAT1,IERROR)
@@ -2399,5 +2406,48 @@
       end subroutine print_detailed_timing
 #endif
 !-----------------------------------------------------------------------------
+      subroutine homology_partition
+      implicit none
+!      include 'DIMENSIONS'
+!#ifdef MPI
+!      include 'mpif.h'
+!#endif
+!      include 'COMMON.SBRIDGE'
+!      include 'COMMON.IOUNITS'
+!      include 'COMMON.SETUP'
+!      include 'COMMON.CONTROL'
+!      include 'COMMON.INTERACT'
+!      include 'COMMON.HOMOLOGY'
+!d      write(iout,*)"homology_partition: lim_odl=",lim_odl,
+!d     &   " lim_dih",lim_dih
+#ifdef MPI
+      if (me.eq.king .or. .not. out1file) write (iout,*) "MPI"
+      call int_bounds(lim_odl,link_start_homo,link_end_homo)
+      call int_bounds(lim_dih,idihconstr_start_homo, &
+       idihconstr_end_homo)
+      idihconstr_start_homo=idihconstr_start_homo+nnt-1+3
+      idihconstr_end_homo=idihconstr_end_homo+nnt-1+3
+      if (me.eq.king .or. .not. out1file)&
+       write (iout,*) 'Processor',fg_rank,' CG group',kolor,&
+       ' absolute rank',MyRank,&
+       ' lim_odl',lim_odl,' link_start=',link_start_homo,&
+       ' link_end',link_end_homo,' lim_dih',lim_dih,&
+       ' idihconstr_start_homo',idihconstr_start_homo,&
+       ' idihconstr_end_homo',idihconstr_end_homo
+#else
+      write (iout,*) "Not MPI"
+      link_start_homo=1
+      link_end_homo=lim_odl
+      idihconstr_start_homo=nnt+3
+      idihconstr_end_homo=lim_dih+nnt-1+3
+      write (iout,*) &
+       ' lim_odl',lim_odl,' link_start=',link_start_homo, &
+       ' link_end',link_end_homo,' lim_dih',lim_dih,&
+       ' idihconstr_start_homo',idihconstr_start_homo,&
+       ' idihconstr_end_homo',idihconstr_end_homo
+#endif
+      return
+      end subroutine homology_partition
+
 !-----------------------------------------------------------------------------
       end module control