Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
flexpart
flexpart
Commits
f06b72a3
Commit
f06b72a3
authored
Nov 19, 2020
by
Espen Sollum
Browse files
MPI: Fix for initial condition field
parent
f04024b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/FLEXPART_MPI.f90
View file @
f06b72a3
...
...
@@ -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 (201
7-08-01
)'
flexversion
=
'Ver '
//
trim
(
flexversion_major
)//
'.
4
MPI (201
9-11-12
)'
verbosity
=
0
! Read the pathnames where input/output files are stored
...
...
src/par_mod.f90
View file @
f06b72a3
...
...
@@ -204,7 +204,7 @@ module par_mod
! Maximum number of particles, species, and similar
!**************************************************
integer
,
parameter
::
maxpart
=
1000000
0
integer
,
parameter
::
maxpart
=
1000000
integer
,
parameter
::
maxspec
=
6
real
,
parameter
::
minmass
=
0.0001
...
...
src/plumetraj.f90
View file @
f06b72a3
...
...
@@ -215,7 +215,7 @@ subroutine plumetraj(itime)
! Write out results in trajectory data file
!******************************************
write
(
unitouttraj
,
'(i5,
1
x,i
8
,2f9.4,4f8.1,f8.2,4f8.1,3f6.1,&
write
(
unitouttraj
,
'(i5,
2
x,i
9,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
,
&
...
...
src/timemanager_mpi.f90
View file @
f06b72a3
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment