Changeset c8fc724 in flexpart.git

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.

Location:

src

Files:

• FLEXPART.f90 (modified) (1 diff)
• FLEXPART_MPI.f90 (modified) (2 diffs)
• com_mod.f90 (modified) (3 diffs)
• readreleases.f90 (modified) (4 diffs)
• readspecies.f90 (modified) (1 diff)
• wetdepo.f90 (modified) (7 diffs)

src/FLEXPART.f90

@@ -414 +414 @@
 
 ! NIK 16.02.2005 
-  write(*,*) '**********************************************'
-  write(*,*) 'Total number of occurences of below-cloud scavenging', tot_blc_count
-  write(*,*) 'Total number of occurences of in-cloud    scavenging', tot_inc_count
-  write(*,*) '**********************************************'
-
+  do i=1,nspec
+    write(*,*) '**********************************************'
+    write(*,*) 'Scavenging statistics for species ', species(i), ':'
+    write(*,*) 'Total number of occurences of below-cloud scavenging', &
+         & tot_blc_count(i)
+    write(*,*) 'Total number of occurences of in-cloud    scavenging', &
+         & tot_inc_count(i)
+    write(*,*) '**********************************************'
+  end do
+  
   write(*,*) 'CONGRATULATIONS: YOU HAVE SUCCESSFULLY COMPLETED A FLE&
        &XPART MODEL RUN!'

src/FLEXPART_MPI.f90

@@ -462 +462 @@
 ! NIK 16.02.2005 
   if (lroot) then
-    call MPI_Reduce(MPI_IN_PLACE, tot_blc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+    call MPI_Reduce(MPI_IN_PLACE, tot_blc_count, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
          & mp_comm_used, mp_ierr)
-    call MPI_Reduce(MPI_IN_PLACE, tot_inc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+    call MPI_Reduce(MPI_IN_PLACE, tot_inc_count, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
          & mp_comm_used, mp_ierr)
   else
     if (mp_partgroup_pid.ge.0) then ! Skip for readwind process 
-      call MPI_Reduce(tot_blc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+      call MPI_Reduce(tot_blc_count, 0, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
            & mp_comm_used, mp_ierr)
-      call MPI_Reduce(tot_inc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
+      call MPI_Reduce(tot_inc_count, 0, nspec, MPI_INTEGER8, MPI_SUM, id_root, &
            & mp_comm_used, mp_ierr)
     end if
@@ -476 +476 @@
 
   if (lroot) then
-    write(*,*) '**********************************************'
-    write(*,*) 'Total number of occurences of below-cloud scavenging', &
-         & tot_blc_count
-    write(*,*) 'Total number of occurences of in-cloud    scavenging', &
-         & tot_inc_count
-    write(*,*) '**********************************************'
+    do i=1,nspec
+      write(*,*) '**********************************************'
+      write(*,*) 'Scavenging statistics for species ', species(i), ':'
+      write(*,*) 'Total number of occurences of below-cloud scavenging', &
+           & tot_blc_count(i)
+      write(*,*) 'Total number of occurences of in-cloud    scavenging', &
+           & tot_inc_count(i)
+      write(*,*) '**********************************************'
+    end do
 
     write(*,*) 'CONGRATULATIONS: YOU HAVE SUCCESSFULLY COMPLETED A FLE&

src/com_mod.f90

@@ -140 +140 @@
 
 !NIK 16.02.2015
-  integer(selected_int_kind(16)) :: tot_blc_count=0, tot_inc_count=0
+  integer(selected_int_kind(16)), dimension(maxspec) :: tot_blc_count=0, &
+       &tot_inc_count=0
 
 
@@ -576 +577 @@
   real :: dxoutn,dyoutn,outlon0n,outlat0n,xoutshiftn,youtshiftn
   !real outheight(maxzgrid),outheighthalf(maxzgrid)
-  logical :: DEP,DRYDEP,DRYDEPSPEC(maxspec),WETDEP,OHREA,ASSSPEC
+  logical :: DEP,DRYDEP,DRYDEPSPEC(maxspec),WETDEP,WETDEPSPEC(maxspec),&
+       & OHREA,ASSSPEC
 
   ! numxgrid,numygrid       number of grid points in x,y-direction
@@ -593 +595 @@
   ! DRYDEPSPEC              .true., if dry deposition is switched on for that species
   ! WETDEP                  .true., if wet deposition is switched on
+  ! WETDEPSPEC              .true., if wet deposition is switched on for that species
   ! OHREA                   .true., if OH reaction is switched on
   ! ASSSPEC                 .true., if there are two species asscoiated

src/readreleases.f90

@@ -276 +276 @@
   do i=1,maxspec
     DRYDEPSPEC(i)=.false.
+    WETDEPSPEC(i)=.false.
   end do
 
@@ -369 +370 @@
          &(dquer(i).gt.0. .and. (crain_aero(i) .gt. 0. .or. csnow_aero(i).gt.0.)))  then
       WETDEP=.true.
+      WETDEPSPEC(i)=.true.
       if (lroot) then
         write (*,*) '  Below-cloud scavenging: ON'
@@ -380 +382 @@
     if (dquer(i).gt.0..and.(ccn_aero(i).gt.0. .or. in_aero(i).gt.0.))  then
       WETDEP=.true.
+      WETDEPSPEC(i)=.true.
       if (lroot) then
         write (*,*) '  In-cloud scavenging: ON'
@@ -399 +402 @@
     endif
 
-  end do
+  end do ! end loop over species
 
   if (WETDEP.or.DRYDEP) DEP=.true.

src/readspecies.f90

@@ -197 +197 @@
     weta_gas(pos_spec)=pweta_gas
     wetb_gas(pos_spec)=pwetb_gas
-    crain_aero=pcrain_aero
-    csnow_aero=pcsnow_aero
+    crain_aero(pos_spec)=pcrain_aero
+    csnow_aero(pos_spec)=pcsnow_aero
     ccn_aero(pos_spec)=pccn_aero
     in_aero(pos_spec)=pin_aero

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