Changeset 41d8574 in flexpart.git for src/timemanager_mpi.f90

Timestamp:

Jan 15, 2016, 12:35:58 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:

fdc0f03

Parents:

d8107c2

Message:

bugfix: MPI version gave wrong wet deposition when using ECMWF cloud water fields. Cloud water in ECMWF fields now uses parameter qc, or reads clwc+ciwc. Added minmass variable as limit for terminating particles.

File:

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

src/timemanager_mpi.f90

@@ -103 +103 @@
   implicit none
 
-  logical :: fc_mp=.true., fc_sync=.true.
   logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0,mind
@@ -352 +351 @@
       do ks=1,nspec
         do kp=1,maxpointspec_act
-          if (decay(ks).gt.0.) then
+          if (decay(ks).gt.0.) then ! TODO move this statement up 2 levels
             do nage=1,nageclass
               do l=1,nclassunc
@@ -485 +484 @@
             if (lroot) then
               if (lnetcdfout.eq.1) then
-
                 call concoutput_surf_netcdf(itime,outnum,gridtotalunc,wetgridtotalunc,&
                      &drygridtotalunc)
@@ -772 +770 @@
           end do
 
-          if (xmassfract.lt.0.00005 .and. sum(real(npart(npoint(j)))*xmass1(j,:)).lt.1.0) then   ! terminate all particles carrying less mass
+          if (xmassfract.lt.minmass) then ! .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),:)),')'