Changeset d9f0585 in flexpart.git for src/readreleases.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/readreleases.f90 (modified) (7 diffs)

src/readreleases.f90

@@ -218 +218 @@
   rewind(unitreleases)
 
+  if (nspec.gt.maxspec) goto 994
+
   ! allocate arrays of matching size for number of species (namelist output)
   deallocate(mass)
@@ -274 +276 @@
   do i=1,maxspec
     DRYDEPSPEC(i)=.false.
+    WETDEPSPEC(i)=.false.
   end do
 
@@ -367 +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'
@@ -378 +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'
@@ -397 +402 @@
     endif
 
-  end do
+  end do ! end loop over species
 
   if (WETDEP.or.DRYDEP) DEP=.true.
@@ -574 +579 @@
   endif
 
+
   ! Determine the release rate (particles per second) and total number
   ! of particles released during the simulation
@@ -633 +639 @@
   endif
 
+  if (lroot) then
+    write(*,FMT='(A,ES14.7)') ' Total mass released:', sum(xmass(1:numpoint,1:nspec))
+  end if
+
   return