Commit 79abee91 authored by Espen Sollum's avatar Espen Sollum
Browse files

Fix for issue #151 (improper use of MPI_IN_PLACE). Also changed default...

Fix for issue #151 (improper use of MPI_IN_PLACE). Also changed default RELEASES file to use SPECIES_001.
parent ed82e080
&COMMAND &COMMAND
LDIRECT= 1, LDIRECT= 1,
IBDATE= 20070911, IBDATE= 20140907,
IBTIME= 050000, IBTIME= 060000,
IEDATE= 20070912, IEDATE= 20140907,
IETIME= 050000, IETIME= 120000,
LOUTSTEP= 3600, LOUTSTEP= 3600,
LOUTAVER= 3600, LOUTAVER= 3600,
LOUTSAMPLE= 900, LOUTSAMPLE= 900,
......
&RELEASES_CTRL &RELEASES_CTRL
NSPEC= 1, NSPEC= 1,
SPECNUM_REL= 108, SPECNUM_REL= 1,
/ /
&RELEASE &RELEASE
IDATE1= 20070911, IDATE1= 20140907,
ITIME1= 070000, ITIME1= 070000,
IDATE2= 20070911, IDATE2= 20140907,
ITIME2= 080000, ITIME2= 070000,
LON1= -75.255 , LON1= -75.255 ,
LON2= -75.255 , LON2= -75.255 ,
LAT1= 38.005 , LAT1= 38.005 ,
LAT2= 38.005 , LAT2= 38.005 ,
! Z1= 1500.000000 ,
! Z2= 2500.000000 ,
Z1= 2500.000000 , Z1= 2500.000000 ,
Z2= 2500.000000 , Z2= 2500.000000 ,
ZKIND= 1, ZKIND= 1,
MASS= 2.0000E8 , MASS= 1.0000E8 ,
PARTS= 10000000 PARTS= 100000
COMMENT="TEST1 ", COMMENT="TEST1",
/ /
! &RELEASE
! IDATE1= 20100911,
! ITIME1= 070000,
! IDATE2= 20100911,
! ITIME2= 080000,
! LON1= -79.250 ,
! LON2= -79.250 ,
! LAT1= 38.100 ,
! LAT2= 38.100 ,
! Z1= 1500.000000 ,
! Z2= 2500.000000 ,
! ZKIND= 1,
! MASS= 2.0000E8 ,
! PARTS= 2000000
! COMMENT="TEST2 ",
! /
...@@ -453,9 +453,9 @@ program flexpart ...@@ -453,9 +453,9 @@ program flexpart
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
else else
if (mp_partgroup_pid.ge.0) then ! Skip for readwind process if (mp_partgroup_pid.ge.0) then ! Skip for readwind process
call MPI_Reduce(tot_blc_count, tot_blc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, & call MPI_Reduce(tot_blc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
call MPI_Reduce(tot_inc_count, tot_inc_count, 1, MPI_INTEGER8, MPI_SUM, id_root, & call MPI_Reduce(tot_inc_count, 0, 1, MPI_INTEGER8, MPI_SUM, id_root, &
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
end if end if
end if end if
......
...@@ -2022,7 +2022,7 @@ contains ...@@ -2022,7 +2022,7 @@ contains
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
if (mp_ierr /= 0) goto 600 if (mp_ierr /= 0) goto 600
else else
call MPI_Reduce(gridunc, gridunc, grid_size3d, mp_sp, MPI_SUM, id_root, & call MPI_Reduce(gridunc, 0, grid_size3d, mp_sp, MPI_SUM, id_root, &
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
end if end if
...@@ -2044,7 +2044,7 @@ contains ...@@ -2044,7 +2044,7 @@ contains
& mp_comm_used,mp_ierr) & mp_comm_used,mp_ierr)
if (mp_ierr /= 0) goto 600 if (mp_ierr /= 0) goto 600
else else
call MPI_Reduce(creceptor,creceptor,rcpt_size,mp_sp,MPI_SUM,id_root, & call MPI_Reduce(creceptor,0,rcpt_size,mp_sp,MPI_SUM,id_root, &
& mp_comm_used,mp_ierr) & mp_comm_used,mp_ierr)
end if end if
...@@ -2098,7 +2098,7 @@ contains ...@@ -2098,7 +2098,7 @@ contains
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
if (mp_ierr /= 0) goto 600 if (mp_ierr /= 0) goto 600
else else
call MPI_Reduce(griduncn, griduncn, grid_size3d, mp_sp, MPI_SUM, id_root, & call MPI_Reduce(griduncn, 0, grid_size3d, mp_sp, MPI_SUM, id_root, &
& mp_comm_used, mp_ierr) & mp_comm_used, mp_ierr)
end if end if
......
Supports Markdown
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