Changes in src/FLEXPART_MPI.f90 [20963b1:0c00f1f] in flexpart.git

File:

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

src/FLEXPART_MPI.f90

@@ -53 +53 @@
   use conv_mod
   use mpi_mod
+  use netcdf_output_mod, only: writeheader_netcdf
   use random_mod, only: gasdev1
   use class_gribfile
-
-#ifdef USE_NCF
-  use netcdf_output_mod, only: writeheader_netcdf
-#endif
 
   implicit none
@@ -67 +64 @@
   integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
   integer :: detectformat
-  integer(selected_int_kind(16)), dimension(maxspec) :: tot_b=0, &
-       & tot_i=0
+
 
 
@@ -207 +203 @@
 
   if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
-    if (lroot) print *,'ECMWF metdata detected'
+    print *,'ECMWF metdata detected'
   elseif (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then
-    if (lroot) print *,'NCEP metdata detected'
+    print *,'NCEP metdata detected'
   else
-    if (lroot) print *,'Unknown metdata format'
+    print *,'Unknown metdata format'
     stop
   endif
@@ -382 +378 @@
 
   if (mp_measure_time) call mpif_mtime('iotime',0)
-
   if (lroot) then ! MPI: this part root process only
-#ifdef USE_NCF
-    if (lnetcdfout.eq.1) then 
-      call writeheader_netcdf(lnest=.false.)
-    else 
-      call writeheader
-    end if
-    
-    if (nested_output.eq.1) then
-      if (lnetcdfout.eq.1) then
-        call writeheader_netcdf(lnest=.true.)
-      else
-        call writeheader_nest
-      endif
-    endif
-#endif
-
+
+  if (lnetcdfout.eq.1) then 
+    call writeheader_netcdf(lnest=.false.)
+  else 
+    call writeheader
+  end if
+
+  if (nested_output.eq.1) then
+    if (lnetcdfout.eq.1) then
+      call writeheader_netcdf(lnest=.true.)
+    else
+      call writeheader_nest
+    endif
+  endif
+
+!
     if (verbosity.gt.0) then
       print*,'call writeheader'
@@ -407 +402 @@
 ! FLEXPART 9.2 ticket ?? write header in ASCII format 
     call writeheader_txt
-
+!if (nested_output.eq.1) call writeheader_nest
     if (nested_output.eq.1.and.surf_only.ne.1) call writeheader_nest
     if (nested_output.eq.1.and.surf_only.eq.1) call writeheader_nest_surf
@@ -414 +409 @@
 
   if (mp_measure_time) call mpif_mtime('iotime',0)
+
+  !open(unitdates,file=path(2)(1:length(2))//'dates')
 
   if (verbosity.gt.0 .and. lroot) then
@@ -484 +481 @@
 
 ! NIK 16.02.2005 
-  if (mp_partgroup_pid.ge.0) then ! Skip for readwind process 
-    call MPI_Reduce(tot_blc_count, tot_b, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
+  if (lroot) then
+    call MPI_Reduce(MPI_IN_PLACE, tot_blc_count, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
          & mp_comm_used, mp_ierr)
-    call MPI_Reduce(tot_inc_count, tot_i, nspec, 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, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
+           & mp_comm_used, mp_ierr)
+      call MPI_Reduce(tot_inc_count, 0, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
+           & mp_comm_used, mp_ierr)
+    end if
   end if
-  
 
   if (lroot) then
@@ -497 +500 @@
       write(*,*) 'Scavenging statistics for species ', species(i), ':'
       write(*,*) 'Total number of occurences of below-cloud scavenging', &
-           & tot_b(i)
-!           & tot_blc_count(i)
+           & tot_blc_count(i)
       write(*,*) 'Total number of occurences of in-cloud    scavenging', &
-           & tot_i(i)
-!           & tot_inc_count(i)
+           & tot_inc_count(i)
       write(*,*) '**********************************************'
     end do