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
0581cac7
Commit
0581cac7
authored
Oct 03, 2016
by
Sabine
Browse files
call of wetdeposition moved back to original call
parent
9669e1e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timemanager.f90
View file @
0581cac7
...
...
@@ -171,7 +171,7 @@ subroutine timemanager
if
(
verbosity
.gt.
0
)
then
write
(
*
,
*
)
'timemanager> call wetdepo'
endif
call
wetdepo
(
itime
,
lsynctime
,
loutnext
,
.false.
)
call
wetdepo
(
itime
,
lsynctime
,
loutnext
)
endif
if
(
OHREA
.and.
itime
.ne.
0
.and.
numpart
.gt.
0
)
&
...
...
@@ -547,13 +547,13 @@ subroutine timemanager
! Before the particle is moved
! the calculation of the scavenged mass shall only be done once after release
! xscav_frac1 was initialised with a negative value
if
(
DRYBKDEP
)
then
do
ks
=
1
,
nspec
if
(
DRYBKDEP
.and.
(
xscav_frac1
(
j
,
ks
)
.lt.
0
))
then
if
(
ks
.eq.
1
)
then
if
((
xscav_frac1
(
j
,
ks
)
.lt.
0
))
then
call
advance_rec
(
itime
,
npoint
(
j
),
idt
(
j
),
uap
(
j
),
ucp
(
j
),
uzp
(
j
),
&
us
(
j
),
vs
(
j
),
ws
(
j
),
nstop
,
xtra1
(
j
),
ytra1
(
j
),
ztra1
(
j
),
prob
,
&
cbt
(
j
))
endif
if
(
decay
(
ks
)
.gt.
0.
)
then
! radioactive decay
decfact
=
exp
(
-
real
(
abs
(
lsynctime
))
*
decay
(
ks
))
else
...
...
@@ -573,26 +573,30 @@ subroutine timemanager
endif
endif
enddo
firstdepocalc
=
.false.
do
ks
=
1
,
nspec
if
((
WETBKDEP
)
.and.
(
xscav_frac1
(
j
,
ks
)
.lt.
0
)
&
.and.
firstdepocalc
.eqv.
.false.
)
then
! Backward wetdeposition and first timestep after release
call
wetdepo
(
itime
,
lsynctime
,
loutnext
,
.true.
)
firstdepocalc
=
.true.
endif
enddo
endif
! if (WETBKDEP) then
! firstdepocalc=.false.
! do ks=1,nspec
! if ((xscav_frac1(j,ks).lt.0) &
! .and.firstdepocalc.eqv..false.) then
! ! Backward wetdeposition and first timestep after release
! call wetdepo(itime,lsynctime,loutnext,.true.)
! firstdepocalc=.true.
! endif
! enddo
! endif
! Integrate Lagevin equation for lsynctime seconds
!*************************************************
if
(
verbosity
.gt.
0
)
then
if
(
j
.eq.
1
)
then
write
(
*
,
*
)
'timemanager> call advance'
endif
endif
call
advance
(
itime
,
npoint
(
j
),
idt
(
j
),
uap
(
j
),
ucp
(
j
),
uzp
(
j
),
&
write
(
*
,
*
)
'timemanager> call advance'
endif
endif
call
advance
(
itime
,
npoint
(
j
),
idt
(
j
),
uap
(
j
),
ucp
(
j
),
uzp
(
j
),
&
us
(
j
),
vs
(
j
),
ws
(
j
),
nstop
,
xtra1
(
j
),
ytra1
(
j
),
ztra1
(
j
),
prob
,
&
cbt
(
j
))
...
...
Write
Preview
Supports
Markdown
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