Changeset ed82e08 in flexpart.git for src

Timestamp:

May 19, 2016, 3:57:19 PM (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:

79abee9

Parents:

06f094f (diff), a652cd5 (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/advance.f90 (modified) (3 diffs)

src/advance.f90

@@ -500 +500 @@
 ! 887     nsp=min(nsp,nspec)
         if (nspec.eq.1.and.density(1).gt.0.) then
-          call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
+          call get_settling(itime,real(xt),real(yt),zt,nspec,settling)  !bugfix
         end if
         w=w+settling
@@ -664 +664 @@
 !        if (density(nsp).gt.0.) then
       if (nspec.eq.1.and.density(1).gt.0.) then
-        call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
+        call get_settling(itime,real(xt),real(yt),zt,nspec,settling)  !bugfix
       end if
       w=w+settling
@@ -870 +870 @@
 !      if (density(nsp).gt.0.) then
     if (nspec.eq.1.and.density(1).gt.0.) then
-      call get_settling(itime+ldt,real(xt),real(yt),zt,nsp,settling)  !bugfix
+      call get_settling(itime+ldt,real(xt),real(yt),zt,nspec,settling)  !bugfix
     end if
     w=w+settling