Changeset c8fc724 in flexpart.git for src/wetdepo.f90

Timestamp:

Feb 2, 2017, 2:23:04 PM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

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

Children:

93786a1

Parents:

4c64400

Message:

Bugfix: using namelist species files would sometimes set incorrect below-cloud scavenging parameters when using more than 1 species. Update: per-species scavenging statistics are written out at end of simulation.

File:

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

src/wetdepo.f90

@@ -90 +90 @@
   real :: frac_act, liq_frac, dquer_m
 
-  integer :: blc_count, inc_count
+  integer(selected_int_kind(16)), dimension(nspec) :: blc_count, inc_count
   real    :: Si_dummy, wetscav_dummy
   logical :: readclouds_this_nest
@@ -107 +107 @@
 !************************
 
-  blc_count=0
-  inc_count=0
+  blc_count(:)=0
+  inc_count(:)=0
 
   do jpart=1,numpart
@@ -256 +256 @@
     do ks=1,nspec      ! loop over species
       wetdeposit(ks)=0. 
-      wetscav=0.   
+      wetscav=0.
+
+! Cycle loop if wet deposition for the species is off
+      if (WETDEPSPEC(ks).eqv..false.) cycle
 
       if (ngrid.gt.0) then
@@ -274 +277 @@
         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=blc_count+1
+          blc_count(ks)=blc_count(ks)+1
           wetscav=weta_gas(ks)*prec(1)**wetb_gas(ks)
 
@@ -280 +283 @@
 !*********************************************************************************
         else if ((dquer(ks).gt.0.).and.(crain_aero(ks).gt.0..or.csnow_aero(ks).gt.0.)) then
-          blc_count=blc_count+1
+          blc_count(ks)=blc_count(ks)+1
 
 !NIK 17.02.2015
@@ -320 +323 @@
 ! 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=inc_count+1
+          inc_count(ks)=inc_count(ks)+1
 ! if negative coefficients (turned off) set to zero for use in equation
           if (ccn_aero(ks).lt.0.) ccn_aero(ks)=0.
@@ -432 +435 @@
 
 ! count the total number of below-cloud and in-cloud occurences:
-  tot_blc_count=tot_blc_count+blc_count
-  tot_inc_count=tot_inc_count+inc_count
+  tot_blc_count(1:nspec)=tot_blc_count(1:nspec)+blc_count(1:nspec)
+  tot_inc_count(1:nspec)=tot_inc_count(1:nspec)+inc_count(1:nspec)
 
 end subroutine wetdepo