Changeset e9e0f06 in flexpart.git for src/get_wetscav.f90

Timestamp:

Dec 12, 2018, 1:35:46 PM (5 years ago)

Author:

Sabine <sabine.eckhardt@…>

Branches:

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

Children:

79996be9

Parents:

db91eb7

Message:

Removed kao and ass_spec and obsolete lines in get_wetscav.f90

File:

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

src/get_wetscav.f90

@@ -151 +151 @@
       if (height(il).gt.ztra1(jpart)) then
         hz=il-1
-!        goto 26
         exit
       endif
     end do
-!26  continue
-
 
     if (ngrid.eq.0) then
@@ -203 +200 @@
 
 
-!ZHG oct 2014 : Calculated for 1) both 2) lsp 3) convp 
+!ZHG oct 2014 : Calculated for 1) both 2) lsp 3) convp - 2 and 3 not used removed by SE
 ! Tentatively differentiate the grfraction for lsp and convp for treating differently the two forms
 ! for now they are treated the same
     grfraction(1)=max(0.05,cc*(lsp*lfr(i)+convp*cfr(j))/(lsp+convp))
-    grfraction(2)=max(0.05,cc*(lfr(i)))
-    grfraction(3)=max(0.05,cc*(cfr(j)))
-
 
 ! 2) Computation of precipitation rate in sub-grid cell
 !******************************************************
     prec(1)=(lsp+convp)/grfraction(1)
-    prec(2)=(lsp)/grfraction(2)
-    prec(3)=(convp)/grfraction(3)
-
 
 ! 3) Computation of scavenging coefficients for all species
 !    Computation of wet deposition
 !**********************************************************
-
 
       if (ngrid.gt.0) then
@@ -237 +227 @@
 !******************************************************************
         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
           wetscav=weta_gas(ks)*prec(1)**wetb_gas(ks)
@@ -271 +260 @@
           endif
           
-!             write(*,*) 'bl-cloud, act_temp=',act_temp, ',prec=',prec(1),',wetscav=', wetscav, ', jpart=',jpart
-
         endif ! gas or particle
 !      endif ! positive below-cloud scavenging parameters given in Species file
@@ -285 +272 @@
         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
-!          write(*,*) 'Incloud: ',inc_count
 ! if negative coefficients (turned off) set to zero for use in equation
           if (ccn_aero(ks).lt.0.) ccn_aero(ks)=0.
@@ -300 +286 @@
 ! 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=1E6*2E-7*prec(1)**0.36 !Sec ECMWF new, is also suitable for GFS
 !           cl=2E-7*prec(1)**0.36 !Andreas
 !           cl=1.6E-6*prec(1)**0.36 !Henrik
@@ -322 +308 @@
           if (dquer(ks).gt.0.) then
             S_i= frac_act/cl
-!           write(*,*) 'Si: ',S_i
-
 ! GAS
 !****
           else
-
             cle=(1-cl)/(henry(ks)*(r_air/3500.)*act_temp)+cl
-!REPLACE to switch old/ new scheme 
-          ! S_i=frac_act/cle
             S_i=1/cle
           endif ! gas or particle
 
 ! scavenging coefficient based on Hertel et al 1995 - using the S_i for either gas or aerosol
-!OLD 
-          if ((readclouds.and.ngrid.eq.0).or.(readclouds_this_nest.and.ngrid.gt.0)) then
+!SEC wetscav fix, the cloud height is no longer needed, it gives wrong results
             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
-          endif
         endif ! positive in-cloud scavenging parameters given in Species file
       endif !incloud