Commit f06b72a3 authored by Espen Sollum's avatar Espen Sollum

MPI: Fix for initial condition field

parent f04024b2
......@@ -72,7 +72,7 @@ program flexpart
! FLEXPART version string
flexversion_major = '10' ! Major version number, also used for species file names
flexversion='Ver. '//trim(flexversion_major)//'.2beta MPI (2017-08-01)'
flexversion='Ver '//trim(flexversion_major)//'.4 MPI (2019-11-12)'
verbosity=0
! Read the pathnames where input/output files are stored
......
......@@ -204,7 +204,7 @@ module par_mod
! Maximum number of particles, species, and similar
!**************************************************
integer,parameter :: maxpart=10000000
integer,parameter :: maxpart=1000000
integer,parameter :: maxspec=6
real,parameter :: minmass=0.0001
......
......@@ -215,7 +215,7 @@ subroutine plumetraj(itime)
! Write out results in trajectory data file
!******************************************
write(unitouttraj,'(i5,1x,i8,2f9.4,4f8.1,f8.2,4f8.1,3f6.1,&
write(unitouttraj,'(i5,2x,i9,2x,2f9.4,4f8.1,f8.2,4f8.1,3f6.1,&
&5(2f8.3,f7.0,f6.1,f8.1))')&
&j,itime-(ireleasestart(j)+ireleaseend(j))/2, &
xcenter,ycenter,zcenter,topocenter,hmixcenter,tropocenter, &
......
......@@ -893,12 +893,14 @@ subroutine timemanager(metdata_format)
! Complete the calculation of initial conditions for particles not yet terminated
!*****************************************************************************
do j=1,numpart
if (linit_cond.ge.1) call initial_cond_calc(itime,j)
end do
if (linit_cond.ge.1) then
do j=1,numpart
call initial_cond_calc(itime,j)
end do
! Transfer sum of init_cond field to root process, for output
call mpif_tm_reduce_initcond
call mpif_tm_reduce_initcond
end if
if (ipout.eq.2) then
! MPI process 0 creates the file, the other processes append to it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment