Changeset b5127f9 in flexpart.git for src/init_domainfill_mpi.f90

Timestamp:

Aug 4, 2017, 2:18:03 PM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

61e07ba, 1d072c0

Parents:

5184a7c

Message:

Fixed an inconsistency (serial vs parallel) with domain-filling option

File:

• src/init_domainfill_mpi.f90 (modified) (3 diffs)

src/init_domainfill_mpi.f90

@@ -370 +370 @@
 !***********************************************
 
-!    do j=1,numpart
-    do j=1,npoint(1)
+    do j=1,numpart
       if ((xtra1_tmp(j).lt.0.).or.(xtra1_tmp(j).ge.real(nxmin1)).or. &
            (ytra1_tmp(j).lt.0.).or.(ytra1_tmp(j).ge.real(nymin1))) then
@@ -475 +474 @@
     endif
 
-    numpart = npart(1)/mp_partgroup_np
+    numpart = numpart/mp_partgroup_np
     if (mod(numpart,mp_partgroup_np).ne.0) numpart=numpart+1
 
@@ -488 +487 @@
 
 ! Distribute particles to other processes (numpart is 'per-process', not total)
-    call MPI_Bcast(numpart, 1, MPI_INTEGER, id_root, mp_comm_used, mp_ierr)
+  call MPI_Bcast(numpart, 1, MPI_INTEGER, id_root, mp_comm_used, mp_ierr)
 ! eso TODO: xmassperparticle: not necessary to send
-    call MPI_Bcast(xmassperparticle, 1, mp_sp, id_root, mp_comm_used, mp_ierr)
-    call mpif_send_part_properties(numpart)
+  call MPI_Bcast(xmassperparticle, 1, mp_sp, id_root, mp_comm_used, mp_ierr)
+  call mpif_send_part_properties(numpart)
 
 ! Deallocate the temporary arrays used for all particles
-    deallocate(itra1_tmp,npoint_tmp,nclass_tmp,idt_tmp,itramem_tmp,&
+  deallocate(itra1_tmp,npoint_tmp,nclass_tmp,idt_tmp,itramem_tmp,&
          & itrasplit_tmp,xtra1_tmp,ytra1_tmp,ztra1_tmp,xmass1_tmp)