Changeset 94bb383 in flexpart.git for src/timemanager.f90

Timestamp:

May 9, 2016, 9:54:04 AM (8 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:

06f094f

Parents:

1a04fab (diff), 18adf60 (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 'wetdep' into dev

File:

• src/timemanager.f90 (modified) (2 diffs)

src/timemanager.f90

@@ -589 +589 @@
             endif
 
-
-            if (mdomainfill.eq.0) then
+! Skip check on mass fraction when npoint represents particle number
+            if (mdomainfill.eq.0.and.mquasilag.eq.0) then
               if (xmass(npoint(j),ks).gt.0.) &
                    xmassfract=max(xmassfract,real(npart(npoint(j)))* &
@@ -605 +605 @@
 !ZHG 2015
             else
-              xmassfract=1.
-            endif
+              xmassfract=1.0
+            end if
           end do