Changeset 4c64400 in flexpart.git for src/FLEXPART_MPI.f90

Timestamp:

Nov 8, 2016, 4:42:27 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:

c8fc724

Parents:

16b61a5

Message:

Bugfix for double precision dry deposition calculation. Added (hardcoded) option to not use output kernel. Version/date string updated.

File:

• src/FLEXPART_MPI.f90 (modified) (5 diffs)

src/FLEXPART_MPI.f90

@@ -63 +63 @@
   ! Initialize arrays in com_mod 
   !*****************************
-  if (.not.lmpreader) call com_mod_allocate_part(maxpart_mpi)
+
+  if(.not.(lmpreader.and.lmp_use_reader)) call com_mod_allocate_part(maxpart_mpi)
+
 
   ! Generate a large number of random numbers
@@ -79 +81 @@
   flexversion_major = '10' ! Major version number, also used for species file names
 !  flexversion='Ver. 10 Beta MPI (2015-05-01)'
-  flexversion='Ver. '//trim(flexversion_major)//' Beta MPI (2015-05-01)'
+  flexversion='Ver. '//trim(flexversion_major)//'.1beta MPI (2016-11-02)'
   verbosity=0
 
@@ -306 +308 @@
   endif
 
-  if (.not.lmpreader) then
+  if (.not.(lmpreader.and.lmp_use_reader)) then
     do j=1, size(itra1) ! maxpart_mpi
       itra1(j)=-999999999
@@ -320 +322 @@
     endif
     ! readwind process skips this step
-    if (lmp_use_reader.and..not.lmpreader) call readpartpositions
+    if (.not.(lmpreader.and.lmp_use_reader)) call readpartpositions
   else
     if (verbosity.gt.0 .and. lroot) then
@@ -427 +429 @@
   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