Changeset 5f9d14a in flexpart.git for src/concoutput_surf_mpi.f90

Timestamp:

Apr 8, 2015, 2:23:27 PM (9 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:

1585284

Parents:

cd85138

Message:

Updated wet depo scheme

File:

• src/concoutput_surf_mpi.f90 (modified) (4 diffs, 1 prop)

src/concoutput_surf_mpi.f90

@@ -105 +105 @@
   character :: adate*8,atime*6
   character(len=3) :: anspec
+  integer :: mind
+! mind        eso:added to get consistent results between 2&3-fields versions
 
 ! Measure execution time
-  if (mp_measure_time) then
-    call cpu_time(mp_root_time_beg)
-    mp_root_wtime_beg = mpi_wtime()
-  end if
-
-  if (verbosity.eq.1) then
-     print*,'inside concoutput_surf '
-     CALL SYSTEM_CLOCK(count_clock)
-     WRITE(*,*) 'SYSTEM_CLOCK',count_clock - count_clock0   
-  endif
+  if (mp_measure_time) call mpif_mtime('rootonly',0)
+
 
   ! Determine current calendar date, needed for the file name
@@ -165 +159 @@
   !*******************************************************************
 
+  mind=memind(2)
   do kz=1,numzgrid
     if (kz.eq.1) then
@@ -187 +182 @@
         iix=max(min(nint(xl),nxmin1),0)
         jjy=max(min(nint(yl),nymin1),0)
-        densityoutgrid(ix,jy,kz)=(rho(iix,jjy,kzz,2)*dz1+ &
-             rho(iix,jjy,kzz-1,2)*dz2)/dz
+        ! densityoutgrid(ix,jy,kz)=(rho(iix,jjy,kzz,2)*dz1+ &
+        !      rho(iix,jjy,kzz-1,2)*dz2)/dz
+        densityoutgrid(ix,jy,kz)=(rho(iix,jjy,kzz,mind)*dz1+ &
+             rho(iix,jjy,kzz-1,mind)*dz2)/dz
       end do
     end do
   end do
 
-    do i=1,numreceptor
-      xl=xreceptor(i)
-      yl=yreceptor(i)
-      iix=max(min(nint(xl),nxmin1),0)
-      jjy=max(min(nint(yl),nymin1),0)
-      densityoutrecept(i)=rho(iix,jjy,1,2)
-    end do
+  do i=1,numreceptor
+    xl=xreceptor(i)
+    yl=yreceptor(i)
+    iix=max(min(nint(xl),nxmin1),0)
+    jjy=max(min(nint(yl),nymin1),0)
+    !densityoutrecept(i)=rho(iix,jjy,1,2)
+    densityoutrecept(i)=rho(iix,jjy,1,mind)
+  end do
 
 
@@ -655 +653 @@
   end do
 
-  if (mp_measure_time) then
-    call cpu_time(mp_root_time_end)
-    mp_root_wtime_end = mpi_wtime()
-    mp_root_time_total = mp_root_time_total + (mp_root_time_end - mp_root_time_beg)
-    mp_root_wtime_total = mp_root_wtime_total + (mp_root_wtime_end - mp_root_wtime_beg)
-  end if
-
+  if (mp_measure_time) call mpif_mtime('rootonly',1)
+  
 end subroutine concoutput_surf