Merge pull request #799 from epochpic/tom/issue798

Fix particle location in load balance

Author: TomGoffrey

epoch1d/src/housekeeping/balance.F90

@@ -1220,9 +1220,9 @@ FUNCTION get_particle_processor(part)
         minpos = x_grid_mins(iproc) - dx * 0.5_num
       END IF
       IF (iproc == nprocx - 1) THEN
-        maxpos = x_grid_maxs(iproc) + dx * (0.5_num + png)
+        maxpos = x_global(cell_x_max(iproc+1)+1) + dx * (png - 0.5_num)
       ELSE
-        maxpos = x_grid_maxs(iproc) + dx * 0.5_num
+        maxpos = x_global(cell_x_max(iproc+1)+1) - dx * 0.5_num
       END IF
       IF (part%part_pos >= minpos .AND. part%part_pos < maxpos) THEN
         coords(c_ndims) = iproc

epoch2d/src/housekeeping/balance.F90

@@ -2114,9 +2114,9 @@ FUNCTION get_particle_processor(part)
         minpos = x_grid_mins(iproc) - dx * 0.5_num
       END IF
       IF (iproc == nprocx - 1) THEN
-        maxpos = x_grid_maxs(iproc) + dx * (0.5_num + png)
+        maxpos = x_global(cell_x_max(iproc+1)+1) + dx * (png - 0.5_num)
       ELSE
-        maxpos = x_grid_maxs(iproc) + dx * 0.5_num
+        maxpos = x_global(cell_x_max(iproc+1)+1) - dx * 0.5_num
       END IF
       IF (part%part_pos(1) >= minpos .AND. part%part_pos(1) < maxpos) THEN
         coords(c_ndims) = iproc
@@ -2131,9 +2131,9 @@ FUNCTION get_particle_processor(part)
         minpos = y_grid_mins(iproc) - dy * 0.5_num
       END IF
       IF (iproc == nprocy - 1) THEN
-        maxpos = y_grid_maxs(iproc) + dy * (0.5_num + png)
+        maxpos = y_global(cell_y_max(iproc+1)+1) + dy * (png - 0.5_num)
       ELSE
-        maxpos = y_grid_maxs(iproc) + dy * 0.5_num
+        maxpos = y_global(cell_y_max(iproc+1)+1) - dy * 0.5_num
       END IF
       IF (part%part_pos(2) >= minpos .AND. part%part_pos(2) < maxpos) THEN
         coords(c_ndims-1) = iproc

epoch3d/src/housekeeping/balance.F90

@@ -2649,9 +2649,9 @@ FUNCTION get_particle_processor(part)
         minpos = x_grid_mins(iproc) - dx * 0.5_num
       END IF
       IF (iproc == nprocx - 1) THEN
-        maxpos = x_grid_maxs(iproc) + dx * (0.5_num + png)
+        maxpos = x_global(cell_x_max(iproc+1)+1) + dx * (png - 0.5_num)
       ELSE
-        maxpos = x_grid_maxs(iproc) + dx * 0.5_num
+        maxpos = x_global(cell_x_max(iproc+1)+1) - dx * 0.5_num
       END IF
       IF (part%part_pos(1) >= minpos .AND. part%part_pos(1) < maxpos) THEN
         coords(c_ndims) = iproc
@@ -2666,9 +2666,9 @@ FUNCTION get_particle_processor(part)
         minpos = y_grid_mins(iproc) - dy * 0.5_num
       END IF
       IF (iproc == nprocy - 1) THEN
-        maxpos = y_grid_maxs(iproc) + dy * (0.5_num + png)
+        maxpos = y_global(cell_y_max(iproc+1)+1) + dy * (png - 0.5_num)
       ELSE
-        maxpos = y_grid_maxs(iproc) + dy * 0.5_num
+        maxpos = y_global(cell_y_max(iproc+1)+1) - dy * 0.5_num
       END IF
       IF (part%part_pos(2) >= minpos .AND. part%part_pos(2) < maxpos) THEN
         coords(c_ndims-1) = iproc
@@ -2683,9 +2683,9 @@ FUNCTION get_particle_processor(part)
         minpos = z_grid_mins(iproc) - dz * 0.5_num
       END IF
       IF (iproc == nprocz - 1) THEN
-        maxpos = z_grid_maxs(iproc) + dz * (0.5_num + png)
+        maxpos = z_global(cell_z_max(iproc+1)+1) + dz * (png - 0.5_num)
       ELSE
-        maxpos = z_grid_maxs(iproc) + dz * 0.5_num
+        maxpos = z_global(cell_z_max(iproc+1)+1) - dz * 0.5_num
       END IF
       IF (part%part_pos(3) >= minpos .AND. part%part_pos(3) < maxpos) THEN
         coords(c_ndims-2) = iproc