Changeset 08a38b5 in flexpart.git for src/conccalc.f90

Timestamp:

Oct 3, 2017, 3:44:21 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:

de4c5e9

Parents:

bb579a9

Message:

Added (hardcoded) option to output number of particles per grid cell.

File:

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

src/conccalc.f90

@@ -193 +193 @@
              (jy.le.numygrid-1)) then
           if (DRYBKDEP.or.WETBKDEP) then
-             do ks=1,nspec
-               gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
-                 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                 xmass1(i,ks)/rhoi*weight*max(xscav_frac1(i,ks),0.0)
-             end do
+            do ks=1,nspec
+              gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
+                   gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
+                   xmass1(i,ks)/rhoi*weight*max(xscav_frac1(i,ks),0.0)
+            end do
           else
-             do ks=1,nspec
-               gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
-                 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                 xmass1(i,ks)/rhoi*weight
-             end do
+            if (lparticlecountoutput) then
+              do ks=1,nspec
+                gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
+                     gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+1
+              end do
+            else
+              do ks=1,nspec
+                gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
+                     gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
+                     xmass1(i,ks)/rhoi*weight
+              end do
+            end if
           endif
         endif
@@ -336 +343 @@
                end do
             else
-               do ks=1,nspec
-                 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
-                   griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/rhoi*weight
-               end do
-            endif
-          endif
-
+              if (lparticlecountoutput) then
+                do ks=1,nspec
+                  griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
+                       griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+1
+                end do
+              else
+                do ks=1,nspec
+                  griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
+                       griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
+                       xmass1(i,ks)/rhoi*weight
+                end do
+              endif
+            endif
+          endif
+          
         else                                 ! attribution via uniform kernel