Changeset 505a96e in flexpart.git for src/releaseparticles_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/releaseparticles_mpi.f90 (modified) (2 diffs)

src/releaseparticles_mpi.f90

@@ -216 +216 @@
               xmass1(ipart,k)=xmass(i,k)/real(npart(i)) &
                    *timecorrect(k)/average_timecorrect
-!             write (*,*) 'xmass1: ',xmass1(ipart,k),ipart,k
+              if (DRYBKDEP.or.WETBKDEP) then ! if there is no scavenging in wetdepo it will be set to 0
+!              if ( henry(k).gt.0 .or. &
+!                   crain_aero(k).gt.0. .or. csnow_aero(k).gt.0. .or. &
+!                   ccn_aero(k).gt.0. .or. in_aero(k).gt.0. )  then
+                xscav_frac1(ipart,k)=-1.
+               endif
 ! Assign certain properties to particle
 !**************************************
@@ -366 +371 @@
 !Af ind_rel is defined in readcommand.f
 
-            if (ind_rel .eq. 1) then
+            if ((ind_rel .eq. 1).or.(ind_rel .eq. 3).or.(ind_rel .eq. 4)) then
 
 ! Interpolate the air density