Changeset 0ecc1fe in flexpart.git for src/mpi_mod.f90

Timestamp:

Nov 30, 2017, 4:04:54 PM (6 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:

d2a5a83

Parents:

c2bd55e

Message:

Changed handling of nested input fields to be consistent with non-nested

File:

• src/mpi_mod.f90 (modified) (2 diffs)

src/mpi_mod.f90

@@ -2536 +2536 @@
 ! if (mp_ierr /= 0) goto 600
 
+#ifdef USE_MPIINPLACE
 ! Using in-place reduction
     if (lroot) then
@@ -2544 +2545 @@
       call MPI_Reduce(griduncn, 0, grid_size3d, mp_sp, MPI_SUM, id_root, &
            & mp_comm_used, mp_ierr)
-    end if
+      if (mp_ierr /= 0) goto 600
+    end if
+
+#else
+    call MPI_Reduce(griduncn, griduncn0, grid_size3d, mp_sp, MPI_SUM, id_root, &
+         & mp_comm_used, mp_ierr)
+    if (mp_ierr /= 0) goto 600
+    if (lroot) griduncn = griduncn0
+
+#endif
 
     if ((WETDEP).and.(ldirect.gt.0)) then