Changeset d6a0977 in flexpart.git for src/timemanager_mpi.f90

Timestamp:

Dec 14, 2015, 3:10:04 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:

f75967d

Parents:

88d8c3d

Message:

Updates to Henrik's wet depo scheme

File:

• src/timemanager_mpi.f90 (modified) (6 diffs)

src/timemanager_mpi.f90

@@ -139 +139 @@
 !**********************************************************************
 
+
+!  itime=0
+  if (lroot) then
+  !  write(*,45) itime,numpart*mp_partgroup_np,gridtotalunc,wetgridtotalunc,drygridtotalunc
+    write(*,46) float(itime)/3600,itime,numpart*mp_partgroup_np
+    
+    if (verbosity.gt.0) then
+      write (*,*) 'timemanager> starting simulation'
+    end if
+  end if ! (lroot)
+
+!CGZ-lifetime: set lifetime to 0
+  checklifetime(:,:)=0
+  species_lifetime(:,:)=0
+  print*, 'Initialized lifetime'
+!CGZ-lifetime: set lifetime to 0
+
+
+
   do itime=0,ideltas,lsynctime
 
@@ -544 +563 @@
         endif
         
-        if (lroot) then
+        !CGZ-lifetime: output species lifetime
+        ! if (lroot) then
+        !   write(*,*) 'Overview species lifetime in days', &
+        !        real((species_lifetime(:,1)/species_lifetime(:,2))/real(3600.0*24.0))
+        !   write(*,*) 'all info:',species_lifetime
           write(*,45) itime,numpart_tot_mpi,gridtotalunc,&
                &wetgridtotalunc,drygridtotalunc
-          if (verbosity.gt.0) then
-            write (*,*) 'timemanager> starting simulation'
-          end if
-        end if
+        !   if (verbosity.gt.0) then
+        !     write (*,*) 'timemanager> starting simulation'
+        !   end if
+        ! end if
 
 45      format(i13,' SECONDS SIMULATED: ',i13, ' PARTICLES:    Uncertainty: ',3f7.3)
@@ -729 +752 @@
 
             if (mdomainfill.eq.0) then
-              if (xmass(npoint(j),ks).gt.0.) &
+              if (xmass(npoint(j),ks).gt.0.)then 
                    xmassfract=max(xmassfract,real(npart(npoint(j)))* &
                    xmass1(j,ks)/xmass(npoint(j),ks))
+                   
+                   !CGZ-lifetime: Check mass fraction left/save lifetime
+                   if(lroot.and.real(npart(npoint(j)))*xmass1(j,ks)/xmass(npoint(j),ks).lt.0.01.and.checklifetime(j,ks).eq.0.)then
+                       !Mass below 1% of initial >register lifetime
+                       checklifetime(j,ks)=abs(itra1(j)-itramem(j))
+
+                       species_lifetime(ks,1)=species_lifetime(ks,1)+abs(itra1(j)-itramem(j))
+                       species_lifetime(ks,2)= species_lifetime(ks,2)+1
+                   endif
+                   !CGZ-lifetime: Check mass fraction left/save lifetime
+                   
+              endif
             else
               xmassfract=1.
@@ -737 +772 @@
           end do
 
-          if (xmassfract.lt.0.0001) then   ! terminate all particles carrying less mass
+          if (xmassfract.lt.0.00005 .and. sum(real(npart(npoint(j)))*xmass1(j,:)).lt.1.0) then   ! terminate all particles carrying less mass
+          !            print*,'terminated particle ',j,' for small mass (', sum(real(npart(npoint(j)))* &
+          !         xmass1(j,:)), ' of ', sum(xmass(npoint(j),:)),')'
             itra1(j)=-999999999
           endif
@@ -758 +795 @@
                  call initial_cond_calc(itime+lsynctime,j)
             itra1(j)=-999999999
+            !print*, 'terminated particle ',j,'for age'
           endif
         endif
@@ -828 +866 @@
   endif
   deallocate(gridunc)
-  deallocate(xpoint1,xpoint2,ypoint1,ypoint2,zpoint1,zpoint2,xmass)
+  deallocate(xpoint1,xpoint2,ypoint1,ypoint2,zpoint1,zpoint2,xmass, checklifetime)
   deallocate(ireleasestart,ireleaseend,npart,kindz)
   deallocate(xmasssave)