Changes in src/get_wetscav.f90 [79e0349:c7e771d] in flexpart.git

File:

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

src/get_wetscav.f90

@@ -72 +72 @@
   integer(kind=1) :: clouds_v
   integer :: ks, kp
-  integer(selected_int_kind(16)), dimension(nspec) :: blc_count, inc_count
-
+  integer :: inc_count, blc_count
 !  integer :: n1,n2, icbot,ictop, indcloud !TEST
   real :: S_i, act_temp, cl, cle ! in cloud scavenging
@@ -238 +237 @@
         if ((dquer(ks).le.0.).and.(weta_gas(ks).gt.0..or.wetb_gas(ks).gt.0.)) then
           !        if (weta(ks).gt.0. .or. wetb(ks).gt.0.) then 
-          blc_count(ks)=blc_count(ks)+1
+          blc_count=blc_count+1
           wetscav=weta_gas(ks)*prec(1)**wetb_gas(ks)
 
@@ -244 +243 @@
 !*********************************************************************************
         else if ((dquer(ks).gt.0.).and.(crain_aero(ks).gt.0..or.csnow_aero(ks).gt.0.)) then
-          blc_count(ks)=blc_count(ks)+1
+          blc_count=blc_count+1
 
 !NIK 17.02.2015
@@ -284 +283 @@
 ! given in species file, or if gas and positive Henry's constant
         if ((ccn_aero(ks).gt.0. .or. in_aero(ks).gt.0.).or.(henry(ks).gt.0.and.dquer(ks).le.0)) then 
-          inc_count(ks)=inc_count(ks)+1
+          inc_count=inc_count+1
 !          write(*,*) 'Incloud: ',inc_count
 ! if negative coefficients (turned off) set to zero for use in equation
@@ -298 +297 @@
           else                                  !parameterize cloudwater m2/m3
 !ZHG updated parameterization of cloud water to better reproduce the values coming from ECMWF
-! sec test
-!           cl=1E6*1E-7*prec(1)**0.3 !Sec GFS new
-            cl=1E6*2E-7*prec(1)**0.36 !Sec ECMWF new
-!           cl=2E-7*prec(1)**0.36 !Andreas
-!           cl=1.6E-6*prec(1)**0.36 !Henrik
+            cl=1.6E-6*prec(1)**0.36
           endif
 
@@ -322 +317 @@
           if (dquer(ks).gt.0.) then
             S_i= frac_act/cl
-!           write(*,*) 'Si: ',S_i
 
 ! GAS
@@ -339 +333 @@
             wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
           else
-!SEC wetscav fix
-             wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
-!            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
+            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
           endif
         endif ! positive in-cloud scavenging parameters given in Species file