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

Timestamp:

May 8, 2017, 8:34:40 AM (7 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:

6985a98

Parents:

d404d98 (diff), c8fc724 (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/FLEXPART_MPI.f90 (modified) (7 diffs)

src/FLEXPART_MPI.f90

@@ -55 +55 @@
 
 
-! Initialize mpi
-!*********************
+  ! Initialize mpi
+  !*********************
   call mpif_init
 
   if (mp_measure_time) call mpif_mtime('flexpart',0)
 
-! Initialize arrays in com_mod 
-!*****************************
-  call com_mod_allocate_part(maxpart_mpi)
+  ! Initialize arrays in com_mod 
+  !*****************************
+
+  if(.not.(lmpreader.and.lmp_use_reader)) call com_mod_allocate_part(maxpart_mpi)
+
 
   ! Generate a large number of random numbers
@@ -79 +81 @@
   flexversion_major = '10' ! Major version number, also used for species file names
 !  flexversion='Ver. 10 Beta MPI (2015-05-01)'
-  flexversion='Ver. '//trim(flexversion_major)//' Beta MPI (2015-05-01)'
+  flexversion='Ver. '//trim(flexversion_major)//'.1beta MPI (2016-11-02)'
   verbosity=0
 
@@ -306 +308 @@
   endif
 
-  do j=1, size(itra1) ! maxpart_mpi
-    itra1(j)=-999999999
-  end do
+  if (.not.(lmpreader.and.lmp_use_reader)) then
+    do j=1, size(itra1) ! maxpart_mpi
+      itra1(j)=-999999999
+    end do
+  end if
 
   ! For continuation of previous run, read in particle positions
@@ -318 +322 @@
     endif
     ! readwind process skips this step
-    if (lmp_use_reader.and..not.lmpreader) call readpartpositions
+    if (.not.(lmpreader.and.lmp_use_reader)) call readpartpositions
   else
     if (verbosity.gt.0 .and. lroot) then
@@ -425 +429 @@
   end do
 
+  ! Inform whether output kernel is used or not
+  !*********************************************
+
+  if (lroot) then
+    if (lnokernel) then
+      write(*,*) "Concentrations are calculated without using kernel"
+    else
+      write(*,*) "Concentrations are calculated using kernel"
+    end if
+  end if
 
 ! Calculate particle trajectories
@@ -448 +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
@@ -462 +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&