Changeset c8fc724 in flexpart.git for src/FLEXPART_MPI.f90

Timestamp:

Feb 2, 2017, 2:23:04 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:

93786a1

Parents:

4c64400

Message:

Bugfix: using namelist species files would sometimes set incorrect below-cloud scavenging parameters when using more than 1 species. Update: per-species scavenging statistics are written out at end of simulation.

File:

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

src/FLEXPART_MPI.f90

@@ -462 +462 @@
 ! NIK 16.02.2005 
   if (lroot) then
-    call MPI_Reduce(MPI_IN_PLACE, tot_blc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+    call MPI_Reduce(MPI_IN_PLACE, tot_blc_count, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
          & mp_comm_used, mp_ierr)
-    call MPI_Reduce(MPI_IN_PLACE, tot_inc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+    call MPI_Reduce(MPI_IN_PLACE, tot_inc_count, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
          & mp_comm_used, mp_ierr)
   else
     if (mp_partgroup_pid.ge.0) then ! Skip for readwind process 
-      call MPI_Reduce(tot_blc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+      call MPI_Reduce(tot_blc_count, 0, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
            & mp_comm_used, mp_ierr)
-      call MPI_Reduce(tot_inc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+      call MPI_Reduce(tot_inc_count, 0, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
            & mp_comm_used, mp_ierr)
     end if
@@ -476 +476 @@
 
   if (lroot) then
-    write(*,*) '**********************************************'
-    write(*,*) 'Total number of occurences of below-cloud scavenging', &
-         & tot_blc_count
-    write(*,*) 'Total number of occurences of in-cloud    scavenging', &
-         & tot_inc_count
-    write(*,*) '**********************************************'
+    do i=1,nspec
+      write(*,*) '**********************************************'
+      write(*,*) 'Scavenging statistics for species ', species(i), ':'
+      write(*,*) 'Total number of occurences of below-cloud scavenging', &
+           & tot_blc_count(i)
+      write(*,*) 'Total number of occurences of in-cloud    scavenging', &
+           & tot_inc_count(i)
+      write(*,*) '**********************************************'
+    end do
 
     write(*,*) 'CONGRATULATIONS: YOU HAVE SUCCESSFULLY COMPLETED A FLE&