Changeset b5127f9 in flexpart.git

Timestamp:

Aug 4, 2017, 2:18:03 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:

61e07ba, 1d072c0

Parents:

5184a7c

Message:

Fixed an inconsistency (serial vs parallel) with domain-filling option

Location:

src

Files:

• init_domainfill.f90 (modified) (2 diffs)
• init_domainfill_mpi.f90 (modified) (3 diffs)
• mean_mod.f90 (modified) (2 diffs)
• mpi_mod.f90 (modified) (3 diffs)
• readavailable.f90 (modified) (2 diffs)
• readcommand.f90 (modified) (2 diffs)
• timemanager_mpi.f90 (modified) (2 diffs)

src/init_domainfill.f90

@@ -400 +400 @@
   end do
 
+! Reduce numpart if invalid particles at end of arrays
+  do i=numpart, 1, -1
+      if (itra1(i).eq.-999999999) then
+        numpart=numpart-1
+      else
+        exit
+      end if
+    end do
+
 ! If particles shall be read in to continue an existing run,
 ! then the accumulated masses at the domain boundaries must be read in, too.
@@ -414 +423 @@
 
 
-
-
 end subroutine init_domainfill

src/init_domainfill_mpi.f90

@@ -370 +370 @@
 !***********************************************
 
-!    do j=1,numpart
-    do j=1,npoint(1)
+    do j=1,numpart
       if ((xtra1_tmp(j).lt.0.).or.(xtra1_tmp(j).ge.real(nxmin1)).or. &
            (ytra1_tmp(j).lt.0.).or.(ytra1_tmp(j).ge.real(nymin1))) then
@@ -475 +474 @@
     endif
 
-    numpart = npart(1)/mp_partgroup_np
+    numpart = numpart/mp_partgroup_np
     if (mod(numpart,mp_partgroup_np).ne.0) numpart=numpart+1
 
@@ -488 +487 @@
 
 ! Distribute particles to other processes (numpart is 'per-process', not total)
-    call MPI_Bcast(numpart, 1, MPI_INTEGER, id_root, mp_comm_used, mp_ierr)
+  call MPI_Bcast(numpart, 1, MPI_INTEGER, id_root, mp_comm_used, mp_ierr)
 ! eso TODO: xmassperparticle: not necessary to send
-    call MPI_Bcast(xmassperparticle, 1, mp_sp, id_root, mp_comm_used, mp_ierr)
-    call mpif_send_part_properties(numpart)
+  call MPI_Bcast(xmassperparticle, 1, mp_sp, id_root, mp_comm_used, mp_ierr)
+  call mpif_send_part_properties(numpart)
 
 ! Deallocate the temporary arrays used for all particles
-    deallocate(itra1_tmp,npoint_tmp,nclass_tmp,idt_tmp,itramem_tmp,&
+  deallocate(itra1_tmp,npoint_tmp,nclass_tmp,idt_tmp,itramem_tmp,&
          & itrasplit_tmp,xtra1_tmp,ytra1_tmp,ztra1_tmp,xmass1_tmp)
 

src/mean_mod.f90

@@ -180 +180 @@
     xq=0._sp
     do i=1,number
-      xl=xl+x_dp(i)
-      xq=xq+x_dp(i)*x_dp(i)
+      xl=xl+real(x_dp(i),kind=sp)
+      xq=xq+real(x_dp(i),kind=sp)*real(x_dp(i),kind=sp)
     end do
 
@@ -237 +237 @@
     end do
 
-    xm=xl/real(number,kind=sp)
+    xm=real(xl,kind=sp)/real(number,kind=sp)
 
     xaux=xq-xl*xl/real(number,kind=dp)

src/mpi_mod.f90

@@ -332 +332 @@
 ! eso 08/2016: Increase maxpart per process, in case of unbalanced distribution
     maxpart_mpi=int(mp_maxpart_factor*real(maxpart)/real(mp_partgroup_np))
+    if (mp_np == 1) maxpart_mpi = maxpart
 
 ! Do not allocate particle data arrays for readwind process
@@ -550 +551 @@
 ! "numpart" is larger than the actual used, so we reduce it if there are
 ! invalid particles at the end of the arrays
+
 601 do i=num_part, 1, -1
       if (itra1(i).eq.-999999999) then
@@ -559 +561 @@
 
 
-!601 end subroutine mpif_send_part_properties
   end subroutine mpif_send_part_properties
 

src/readavailable.f90

@@ -63 +63 @@
   integer :: i,idiff,ldat,ltim,wftime1(maxwf),numbwfn(maxnests),k
   integer :: wftime1n(maxnests,maxwf),wftimen(maxnests,maxwf)
+  logical :: lwarntd=.true.
   real(kind=dp) :: juldate,jul,beg,end
   character(len=255) :: fname,spec,wfname1(maxwf),wfspec1(maxwf)
@@ -241 +242 @@
            &'
       write(*,*) 'THEREFORE, TRAJECTORIES HAVE TO BE SKIPPED.'
-    else if (idiff.gt.idiffnorm.and.lroot) then
+    else if (idiff.gt.idiffnorm.and.lroot.and.lwarntd) then
       write(*,*) 'FLEXPART WARNING: TIME DIFFERENCE BETWEEN TWO'
       write(*,*) 'WIND FIELDS IS BIG. THIS MAY CAUSE A DEGRADATION'
       write(*,*) 'OF SIMULATION QUALITY.'
+      lwarntd=.false. ! only issue this warning once
     endif
   end do

src/readcommand.f90

@@ -146 +146 @@
   ohfields_path="../../flexin/"
 
+  !Af set release-switch
+  WETBKDEP=.false.
+  DRYBKDEP=.false.
+
   ! Open the command file and read user options
   ! Namelist input first: try to read as namelist file
@@ -321 +325 @@
         ind_samp = 0
      endif
-  !Af set release-switch
-     WETBKDEP=.false.
-     DRYBKDEP=.false.
      select case (ind_receptor)
      case (1)  !  1 .. concentration at receptor

src/timemanager_mpi.f90

@@ -773 +773 @@
               endif
             else
-              xmassfract=1.
+              xmassfract=1.0
             endif
           end do
@@ -781 +781 @@
           !         xmass1(j,:)), ' of ', sum(xmass(npoint(j),:)),')'
             itra1(j)=-999999999
+            if (verbosity.gt.0) then
+              print*,'terminated particle ',j,' for small mass'
+            endif
           endif