Changes in src/timemanager_mpi.f90 [20963b1:d8eed02] in flexpart.git

File:

• src/timemanager_mpi.f90 (modified) (12 diffs)

src/timemanager_mpi.f90

@@ -102 +102 @@
   use com_mod
   use mpi_mod
-#ifdef USE_NCF
   use netcdf_output_mod, only: concoutput_netcdf,concoutput_nest_netcdf,&
        &concoutput_surf_netcdf,concoutput_surf_nest_netcdf
-#endif
 
   implicit none
@@ -115 +113 @@
   integer :: ip
   integer :: loutnext,loutstart,loutend
-  integer :: ix,jy,ldeltat,itage,nage,idummy
+  integer :: ix,jy,ldeltat,itage,nage
   integer :: i_nan=0,ii_nan,total_nan_intl=0  !added by mc to check instability in CBL scheme 
   integer :: numpart_tot_mpi ! for summing particles on all processes
-  real :: outnum,weight,prob(maxspec), prob_rec(maxspec), decfact,wetscav
+  real :: outnum,weight,prob(maxspec)
+  real :: decfact
 
   real(sp) :: gridtotalunc
@@ -124 +123 @@
        & drydeposit(maxspec)=0_dep_prec
   real :: xold,yold,zold,xmassfract
-  real :: grfraction(3)
   real, parameter :: e_inv = 1.0/exp(1.0)
 
@@ -159 +157 @@
 !CGZ-lifetime: set lifetime to 0
 
-  if (.not.lusekerneloutput) write(*,*) 'Not using the kernel'
-  if (turboff) write(*,*) 'Turbulence switched off'
 
 
@@ -485 +481 @@
             if (lroot) then
               if (lnetcdfout.eq.1) then 
-#ifdef USE_NCF
                 call concoutput_netcdf(itime,outnum,gridtotalunc,wetgridtotalunc,&
                      &drygridtotalunc)
-#endif
               else 
                 call concoutput(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
@@ -500 +494 @@
             if (lroot) then
               if (lnetcdfout.eq.1) then
-#ifdef USE_NCF
                 call concoutput_surf_netcdf(itime,outnum,gridtotalunc,wetgridtotalunc,&
                      &drygridtotalunc)
-#endif
               else
                 call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
@@ -521 +513 @@
             call mpif_tm_reduce_grid_nest
  
-            if (mp_measure_time) call mpif_mtime('iotime',0)
+           if (mp_measure_time) call mpif_mtime('iotime',0)
 
             if (lnetcdfout.eq.0) then
@@ -534 +526 @@
               else  ! :TODO: check for zeroing in the netcdf module
                 call concoutput_surf_nest(itime,outnum)
+
               end if
+
             else
-#ifdef USE_NCF
+
               if (surf_only.ne.1) then
                 if (lroot) then              
@@ -550 +544 @@
                 end if
               endif
-#endif
+
+
             end if
           end if
+          
+
           outnum=0.
         endif
@@ -710 +707 @@
         zold=ztra1(j)
 
-   
-  ! RECEPTOR: dry/wet depovel
-  !****************************
-  ! Before the particle is moved 
-  ! the calculation of the scavenged mass shall only be done once after release
-  ! xscav_frac1 was initialised with a negative value
-
-      if  (DRYBKDEP) then
-       do ks=1,nspec
-         if  ((xscav_frac1(j,ks).lt.0)) then
-            call get_vdep_prob(itime,xtra1(j),ytra1(j),ztra1(j),prob_rec)
-            if (DRYDEPSPEC(ks)) then        ! dry deposition
-               xscav_frac1(j,ks)=prob_rec(ks)
-             else
-                xmass1(j,ks)=0.
-                xscav_frac1(j,ks)=0.
-             endif
-         endif
-        enddo
-       endif
-
-       if (WETBKDEP) then 
-       do ks=1,nspec
-         if  ((xscav_frac1(j,ks).lt.0)) then
-            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)
-            if (wetscav.gt.0) then
-                xscav_frac1(j,ks)=wetscav* &
-                       (zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1)
-            else
-                xmass1(j,ks)=0.
-                xscav_frac1(j,ks)=0.
-            endif
-         endif
-        enddo
-       endif
-
 ! Integrate Lagevin equation for lsynctime seconds
 !*************************************************
@@ -847 +808 @@
                  call initial_cond_calc(itime+lsynctime,j)
             itra1(j)=-999999999
-            if (verbosity.gt.0) then
-              print*, 'terminated particle ',j,'for age'
-            endif
+            !print*, 'terminated particle ',j,'for age'
           endif
         endif
@@ -860 +819 @@
 
 
-! Counter of "unstable" particle velocity during a time scale
-! of maximumtl=20 minutes (defined in com_mod)
-!************************************************************
+! Added by mc: counter of "unstable" particle velocity during a time scale
+!   of maximumtl=20 minutes (defined in com_mod)
+
     total_nan_intl=0
     i_nan=i_nan+1 ! added by mc to count nan during a time of maxtl (i.e. maximum tl fixed here to 20 minutes, see com_mod)