Changeset d9f0585 in flexpart.git for src/FLEXPART.f90

Timestamp:

May 8, 2017, 8:34:40 AM (7 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, univie

Children:

6985a98

Parents:

d404d98 (diff), c8fc724 (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:

Merge branch 'dev' of git.nilu.no:flexpart/flexpart into dev

File:

• src/FLEXPART.f90 (modified) (3 diffs)

src/FLEXPART.f90

@@ -67 +67 @@
   call gasdev1(idummy,rannumb(maxrand),rannumb(maxrand-1))
 
+
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.0beta (2015-05-01)'
+  flexversion='Version '//trim(flexversion_major)//'.1beta (2016-11-02)'
   verbosity=0
 
@@ -384 +385 @@
   end do
 
+  ! Inform whether output kernel is used or not
+  !*********************************************
+  if (lroot) then
+    if (lnokernel) then
+      write(*,*) "Concentrations are calculated without using kernel"
+    else
+      write(*,*) "Concentrations are calculated using kernel"
+    end if
+  end if
+
+
   ! Calculate particle trajectories
   !********************************
@@ -402 +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!'