Changes in src/concoutput.f90 [54cbd6c:16b61a5] in flexpart.git

File:

• src/concoutput.f90 (modified) (3 diffs)

src/concoutput.f90

@@ -246 +246 @@
 
     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
@@ -351 +342 @@
 ! 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
@@ -635 +626 @@
 !*************************
 
-  ! 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
+! 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
   creceptor(:,:)=0.
   gridunc(:,:,:,:,:,:,:)=0.