Changes in src/timemanager_mpi.f90 [3b80e98:16b61a5] in flexpart.git

File:

• src/timemanager_mpi.f90 (modified) (9 diffs)

src/timemanager_mpi.f90

@@ -104 +104 @@
 
   logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
-  integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0 !,mind
+  integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0
 ! integer :: ksp
   integer :: ip
@@ -155 +155 @@
 
   do itime=0,ideltas,lsynctime
+    
 
 ! Computation of wet deposition, OH reaction and mass transfer
@@ -166 +167 @@
 !********************************************************************
 
-    if (mp_dev_mode) write(*,*) 'myid, itime: ',mp_pid,itime
+    if (mp_dbg_mode) write(*,*) 'myid, itime: ',mp_pid,itime
     
     if (WETDEP .and. itime .ne. 0 .and. numpart .gt. 0) then
@@ -330 +331 @@
       call releaseparticles(itime)
     endif
+
+
+! Check if particles should be redistributed among processes
+!***********************************************************
+    call mpif_calculate_part_redist(itime)
 
 
@@ -548 +554 @@
 ! Decide whether to write an estimate of the number of particles released, 
 ! or exact number (require MPI reduce operation)
-        if (mp_dev_mode) then
+        if (mp_dbg_mode) then
           numpart_tot_mpi = numpart
         else
@@ -555 +561 @@
 
         if (mp_exact_numpart.and..not.(lmpreader.and.lmp_use_reader).and.&
-             &.not.mp_dev_mode) then
+             &.not.mp_dbg_mode) then
           call MPI_Reduce(numpart, numpart_tot_mpi, 1, MPI_INTEGER, MPI_SUM, id_root, &
                & mp_comm_used, mp_ierr)
@@ -561 +567 @@
         
         !CGZ-lifetime: output species lifetime
-        if (lroot.or.mp_dev_mode) then
+        if (lroot.or.mp_dbg_mode) then
         !   write(*,*) 'Overview species lifetime in days', &
         !        real((species_lifetime(:,1)/species_lifetime(:,2))/real(3600.0*24.0))
@@ -571 +577 @@
         !   end if
         end if
+
+        ! Write number of particles for all processes
+        if (mp_dev_mode) write(*,*) "PID, itime, numpart", mp_pid,itime,numpart
+
 
 45      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
@@ -860 +870 @@
   endif
   deallocate(gridunc)
-  deallocate(xpoint1,xpoint2,ypoint1,ypoint2,zpoint1,zpoint2,xmass, checklifetime)
+  deallocate(xpoint1,xpoint2,ypoint1,ypoint2,zpoint1,zpoint2,xmass)
+  if (allocated(checklifetime)) deallocate(checklifetime)
   deallocate(ireleasestart,ireleaseend,npart,kindz)
   deallocate(xmasssave)