Changes in / [94bb383:1a04fab] in flexpart.git

Location:

src

Files:

• advance.f90 (modified) (3 diffs)
• par_mod.f90 (modified) (1 diff)
• partoutput_short.f90 (modified) (1 diff)
• timemanager.f90 (modified) (2 diffs)
• timemanager_mpi.f90 (modified) (2 diffs)

src/advance.f90

@@ -493 +493 @@
 
       if (mdomainfill.eq.0) then
-! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
-!              particle number and thus xmass array goes out of bounds
-!        do nsp=1,nspec
-!           if (xmass(nrelpoint,nsp).gt.eps2) goto 887
-!         end do
-! 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
-        end if
+        do nsp=1,nspec
+          if (xmass(nrelpoint,nsp).gt.eps2) goto 887
+        end do
+887     nsp=min(nsp,nspec)
+!!$        if (density(nsp).gt.0.) &
+!!$             call get_settling(itime,xts,yts,zt,nsp,settling)    !old
+        if (density(nsp).gt.0.) &
+             call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
         w=w+settling
       endif
@@ -655 +654 @@
 
     if (mdomainfill.eq.0) then
-! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
-!              particle number and thus xmass array goes out of bounds
-
-!      do nsp=1,nspec
-!         if (xmass(nrelpoint,nsp).gt.eps2) goto 888
-!       end do
-! 888   nsp=min(nsp,nspec)
-!        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
-      end if
+      do nsp=1,nspec
+        if (xmass(nrelpoint,nsp).gt.eps2) goto 888
+      end do
+888   nsp=min(nsp,nspec)
+!!$      if (density(nsp).gt.0.) &
+!!$           call get_settling(itime,xts,yts,zt,nsp,settling)    !old
+      if (density(nsp).gt.0.) &
+           call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
       w=w+settling
     endif
@@ -862 +858 @@
 
   if (mdomainfill.eq.0) then
-! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
-!              particle number and thus xmass array goes out of bounds
-!    do nsp=1,nspec
-!       if (xmass(nrelpoint,nsp).gt.eps2) goto 889
-!     end do
-! 889   nsp=min(nsp,nspec)
-!      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
-    end if
+    do nsp=1,nspec
+      if (xmass(nrelpoint,nsp).gt.eps2) goto 889
+    end do
+889   nsp=min(nsp,nspec)
+!!$    if (density(nsp).gt.0.) &
+!!$         call get_settling(itime+ldt,xts,yts,zt,nsp,settling)    !old
+    if (density(nsp).gt.0.) &
+         call get_settling(itime+ldt,real(xt),real(yt),zt,nsp,settling)  !bugfix
     w=w+settling
   endif

src/par_mod.f90

@@ -186 +186 @@
   !**************************************************
 
-  integer,parameter :: maxpart=1000000
+  integer,parameter :: maxpart=20000000
   integer,parameter :: maxspec=6
   real,parameter :: minmass=0.0001

src/partoutput_short.f90

@@ -146 +146 @@
 
 
-  !write(*,*) numshortout,numshortall
+  write(*,*) numshortout,numshortall
 
   close(unitshortpart)

src/timemanager.f90

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

src/timemanager_mpi.f90

@@ -546 +546 @@
 ! Decide whether to write an estimate of the number of particles released, 
 ! or exact number (require MPI reduce operation)
-        if (mp_dev_mode) then
-          numpart_tot_mpi = numpart
-        else
-          numpart_tot_mpi = numpart*mp_partgroup_np
-        end if
-
-        if (mp_exact_numpart.and..not.(lmpreader.and.lmp_use_reader).and.&
-             &.not.mp_dev_mode) then
+        numpart_tot_mpi = numpart*mp_partgroup_np
+
+        if (mp_exact_numpart.and..not.(lmpreader.and.lmp_use_reader)) then
           call MPI_Reduce(numpart, numpart_tot_mpi, 1, MPI_INTEGER, MPI_SUM, id_root, &
                & mp_comm_used, mp_ierr)
@@ -743 +738 @@
             endif
 
-! Skip check on mass fraction when npoint represents particle number
-            if (mdomainfill.eq.0.and.mquasilag.eq.0) then
+
+            if (mdomainfill.eq.0) then
               if (xmass(npoint(j),ks).gt.0.)then 
                    xmassfract=max(xmassfract,real(npart(npoint(j)))* &