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
e52967c0
Commit
e52967c0
authored
Jun 04, 2017
by
Espen Sollum
Browse files
Quick fix for segmentation fault when particle is at north pole
parent
72d3a5a7
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/advance.f90
View file @
e52967c0
...
@@ -242,6 +242,12 @@ subroutine advance(itime,nrelpoint,ldt,up,vp,wp, &
...
@@ -242,6 +242,12 @@ subroutine advance(itime,nrelpoint,ldt,up,vp,wp, &
dt2
=
real
(
memtime
(
2
)
-
itime
)
dt2
=
real
(
memtime
(
2
)
-
itime
)
dtt
=
1.
/(
dt1
+
dt2
)
dtt
=
1.
/(
dt1
+
dt2
)
! eso: Temporary fix for particle exactly at north pole
if
(
jyp
>=
nymax
)
then
! write(*,*) 'WARNING: advance.f90 jyp >= nymax. xt,yt:',xt,yt
jyp
=
jyp
-1
end
if
! Compute maximum mixing height around particle position
! Compute maximum mixing height around particle position
!*******************************************************
!*******************************************************
...
...
src/conccalc.f90
View file @
e52967c0
...
@@ -110,6 +110,12 @@ subroutine conccalc(itime,weight)
...
@@ -110,6 +110,12 @@ subroutine conccalc(itime,weight)
p3
=
rddx
*
ddy
p3
=
rddx
*
ddy
p4
=
ddx
*
ddy
p4
=
ddx
*
ddy
! eso: Temporary fix for particle exactly at north pole
if
(
jyp
>=
nymax
)
then
! write(*,*) 'WARNING: conccalc.f90 jyp >= nymax'
jyp
=
jyp
-1
end
if
do
il
=
2
,
nz
do
il
=
2
,
nz
if
(
height
(
il
)
.gt.
ztra1
(
i
))
then
if
(
height
(
il
)
.gt.
ztra1
(
i
))
then
indz
=
il
-1
indz
=
il
-1
...
...
src/conccalc_mpi.f90
View file @
e52967c0
...
@@ -117,6 +117,12 @@ subroutine conccalc(itime,weight)
...
@@ -117,6 +117,12 @@ subroutine conccalc(itime,weight)
p3
=
rddx
*
ddy
p3
=
rddx
*
ddy
p4
=
ddx
*
ddy
p4
=
ddx
*
ddy
! eso: Temporary fix for particle exactly at north pole
if
(
jyp
>=
nymax
)
then
! write(*,*) 'WARNING: conccalc.f90 jyp >= nymax'
jyp
=
jyp
-1
end
if
do
il
=
2
,
nz
do
il
=
2
,
nz
if
(
height
(
il
)
.gt.
ztra1
(
i
))
then
if
(
height
(
il
)
.gt.
ztra1
(
i
))
then
indz
=
il
-1
indz
=
il
-1
...
...
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