Changeset 505a96e in flexpart.git for src/timemanager_mpi.f90

Timestamp:

May 22, 2018, 2:40:40 PM (6 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

cd6e10c, 77778f8

Parents:

3d04845 (diff), 20963b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Pull: Merge branch 'dev' of ​https://git.nilu.no/flexpart/flexpart into dev

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
@@ -113 +115 @@
   integer :: ip
   integer :: loutnext,loutstart,loutend
-  integer :: ix,jy,ldeltat,itage,nage
+  integer :: ix,jy,ldeltat,itage,nage,idummy
   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)
-  real :: decfact
+  real :: outnum,weight,prob(maxspec), prob_rec(maxspec), decfact,wetscav
 
   real(sp) :: gridtotalunc
@@ -123 +124 @@
        & drydeposit(maxspec)=0_dep_prec
   real :: xold,yold,zold,xmassfract
+  real :: grfraction(3)
   real, parameter :: e_inv = 1.0/exp(1.0)
 
@@ -157 +159 @@
 !CGZ-lifetime: set lifetime to 0
 
+  if (.not.lusekerneloutput) write(*,*) 'Not using the kernel'
+  if (turboff) write(*,*) 'Turbulence switched off'
 
 
@@ -481 +485 @@
             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)
@@ -494 +500 @@
             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)
@@ -513 +521 @@
             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
@@ -526 +534 @@
               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              
@@ -544 +550 @@
                 end if
               endif
-
-
+#endif
             end if
           end if
-          
-
           outnum=0.
         endif
@@ -707 +710 @@
         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
 !*************************************************
@@ -808 +847 @@
                  call initial_cond_calc(itime+lsynctime,j)
             itra1(j)=-999999999
-            !print*, 'terminated particle ',j,'for age'
+            if (verbosity.gt.0) then
+              print*, 'terminated particle ',j,'for age'
+            endif
           endif
         endif
@@ -819 +860 @@
 
 
-! Added by mc: counter of "unstable" particle velocity during a time scale
-!   of maximumtl=20 minutes (defined in com_mod)
-
+! 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)