Changeset 46706c7 in flexpart.git for src/boundcond_domainfill_mpi.f90

Timestamp:

Aug 31, 2016, 9:01:42 AM (8 years ago)

Author:

Sabine <sabine.eckhardt@…>

Branches:

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

Children:

d404d98

Parents:

35fa90d (diff), 0f7835d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'dev' of git.nilu.no:flexpart/flexpart into dev

File:

• src/boundcond_domainfill_mpi.f90 (modified) (4 diffs)

src/boundcond_domainfill_mpi.f90

@@ -232 +232 @@
 
         do m=1,mmass
-          do ipart=minpart,maxpart
+          do ipart=minpart,maxpart_mpi
 
   ! If a vacant storage space is found, attribute everything to this array element
@@ -331 +331 @@
             endif
           end do
-          if (ipart.gt.maxpart) &
+          if (ipart.gt.maxpart_mpi) &
                stop 'boundcond_domainfill.f: too many particles required'
 73        minpart=ipart+1
@@ -464 +464 @@
 
         do m=1,mmass
-          do ipart=minpart,maxpart
+          do ipart=minpart,maxpart_mpi
 
   ! If a vacant storage space is found, attribute everything to this array element
@@ -562 +562 @@
             endif
           end do
-          if (ipart.gt.maxpart) &
+          if (ipart.gt.maxpart_mpi) &
                stop 'boundcond_domainfill.f: too many particles required'
 173       minpart=ipart+1