Changes in src/concoutput_mpi.f90 [20963b1:6a678e3] in flexpart.git

File:

• src/concoutput_mpi.f90 (modified) (7 diffs)

src/concoutput_mpi.f90

@@ -104 +104 @@
   real,parameter :: weightair=28.97
   logical :: sp_zer
-  logical,save :: init=.true.
+  LOGICAL,save :: init=.true.
   character :: adate*8,atime*6
   character(len=3) :: anspec
@@ -113 +113 @@
   integer :: ierr
   character(LEN=100) :: dates_char
+!  character :: dates_char
 
 ! Measure execution time
@@ -128 +129 @@
 ! This fixes a bug where the dates file kept growing across multiple runs
 
-! If 'dates' file exists in output directory, make a backup
+! If 'dates' file exists, make a backup
   inquire(file=path(2)(1:length(2))//'dates', exist=ldates_file)
   if (ldates_file.and.init) then
@@ -257 +258 @@
 
     write(anspec,'(i3.3)') ks
-
-    if (DRYBKDEP.or.WETBKDEP) then !scavdep output
-      if (DRYBKDEP) & 
-      open(unitoutgrid,file=path(2)(1:length(2))//'grid_drydep_'//adate// &
+    if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
+      if (ldirect.eq.1) then
+        open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_'//adate// &
+             atime//'_'//anspec,form='unformatted')
+      else
+        open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_'//adate// &
+             atime//'_'//anspec,form='unformatted')
+      endif
+      write(unitoutgrid) itime
+    endif
+
+    if ((iout.eq.2).or.(iout.eq.3)) then      ! mixing ratio
+      open(unitoutgridppt,file=path(2)(1:length(2))//'grid_pptv_'//adate// &
            atime//'_'//anspec,form='unformatted')
-      if (WETBKDEP) & 
-      open(unitoutgrid,file=path(2)(1:length(2))//'grid_wetdep_'//adate// &
-           atime//'_'//anspec,form='unformatted')
-      write(unitoutgrid) itime
-    else
-      if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
-        if (ldirect.eq.1) then
-          open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_'//adate// &
-               atime//'_'//anspec,form='unformatted')
-        else
-          open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_'//adate// &
-               atime//'_'//anspec,form='unformatted')
-        endif
-        write(unitoutgrid) itime
-      endif
-
-      if ((iout.eq.2).or.(iout.eq.3)) then      ! mixing ratio
-        open(unitoutgridppt,file=path(2)(1:length(2))//'grid_pptv_'//adate// &
-             atime//'_'//anspec,form='unformatted')
-
-        write(unitoutgridppt) itime
-      endif
-    endif ! if deposition output
+
+      write(unitoutgridppt) itime
+    endif
 
     do kp=1,maxpointspec_act
@@ -364 +354 @@
 ! Concentration output
 !*********************
-        if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5).or.(iout.eq.6)) then
+        if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
 
 ! Wet deposition
@@ -459 +449 @@
                   endif
                   sp_count_r=sp_count_r+1
-                  if (lparticlecountoutput) then
-                    sparse_dump_r(sp_count_r)= &
-                         sp_fact* &
-                         grid(ix,jy,kz)
-                  else
                   sparse_dump_r(sp_count_r)= &
                        sp_fact* &
                        grid(ix,jy,kz)* &
                        factor3d(ix,jy,kz)/tot_mu(ks,kp)
-                  end if
-
-
 !                 if ((factor(ix,jy,kz)/tot_mu(ks,kp)).eq.0)
 !    +              write (*,*) factor(ix,jy,kz),tot_mu(ks,kp),ks,kp
@@ -656 +638 @@
 !*************************
 
-  creceptor(:,:)=0.
-  gridunc(:,:,:,:,:,:,:)=0.
+  do ks=1,nspec
+    do kp=1,maxpointspec_act
+      do i=1,numreceptor
+        creceptor(i,ks)=0.
+      end do
+      do jy=0,numygrid-1
+        do ix=0,numxgrid-1
+          do l=1,nclassunc
+            do nage=1,nageclass
+              do kz=1,numzgrid
+                gridunc(ix,jy,kz,ks,kp,l,nage)=0.
+              end do
+            end do
+          end do
+        end do
+      end do
+    end do
+  end do
 
   if (mp_measure_time) call mpif_mtime('rootonly',1)