Changeset 16b61a5 in flexpart.git for src/FLEXPART_MPI.f90

Timestamp:

Oct 14, 2016, 3:19:00 PM (8 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:

4c64400

Parents:

861805a

Message:

Reworked the domain-filling option (MPI). Fixed a slow loop which had errors in loop counter (MPI)

File:

• src/FLEXPART_MPI.f90 (modified) (3 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) call com_mod_allocate_part(maxpart_mpi)
 
   ! Generate a large number of random numbers
@@ -306 +306 @@
   endif
 
-  do j=1, size(itra1) ! maxpart_mpi
-    itra1(j)=-999999999
-  end do
+  if (.not.lmpreader) then
+    do j=1, size(itra1) ! maxpart_mpi
+      itra1(j)=-999999999
+    end do
+  end if
 
   ! For continuation of previous run, read in particle positions
@@ -463 +465 @@
   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(*,*) 'Total number of occurences of below-cloud scavenging', &
+         & tot_blc_count
+    write(*,*) 'Total number of occurences of in-cloud    scavenging', &
+         & tot_inc_count
     write(*,*) '**********************************************'