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
fd6eec30
Commit
fd6eec30
authored
Sep 25, 2018
by
Sabine
Browse files
BUGFIX: syncronisation problem fixed
parent
d801235d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/calculate_watercycle.f90
View file @
fd6eec30
...
...
@@ -47,8 +47,10 @@ subroutine calculate_watercycle(partnumber,itime)
integer
ixr
,
jyr
,
idumx
,
idumy
,
istep
,
watersynctime
watersynctime
=
3600
*
3
! was loutstep before, but for monthly run not possible
! watersynctime=loutstep
! watersynctime=3600*3 ! was loutstep before, but for monthly run not possible
watersynctime
=
3600
! watersynctime=loutstep
if
((
partnumber
.eq.
1
)
.and.
(
itime
.eq.
0
))
write
(
*
,
*
)
'Watersynctime '
,
watersynctime
,
lsynctime
! Some variables needed for temporal interpolation
!*************************************************
...
...
@@ -227,7 +229,7 @@ subroutine calculate_watercycle(partnumber,itime)
! e_minus_pi=precip_reference(ix+1,jy-90+2)*(-24.)
! First timestep and criteria fullfilled, keep it or throw it?
if
(
((
diff
.ge.
0
)
.or.
((
e_minus_pi
/
24
)
.gt.
-
1.0
))
.and.
(
status_q
(
i
)
.eq.
1
)
)
then
if
(
((
diff
.ge.
0
)
.or.
((
e_minus_pi
/
24
)
.gt.
-
.5
))
.and.
(
status_q
(
i
)
.eq.
1
)
)
then
! if ( ((diff.ge.0).or.((e_minus_pi/24).gt.-2.0)) .and. (status_q(i).eq.1) ) then
! if ( ((diff.ge.0)) .and. (status_q(i).eq.1) ) then
! if (status_q(i).eq.-100) then ! never! all trajectories.
...
...
src/timemanager.f90
View file @
fd6eec30
...
...
@@ -375,9 +375,9 @@ subroutine timemanager(metdata_format)
!**************************************************
if
((
ldirect
*
itime
.ge.
ldirect
*
loutstart
)
.and.
&
(
ldirect
*
itime
.le.
ldirect
*
loutend
))
then
! add to grid
if
(
mod
(
itime
-
loutstart
,
loutsample
)
.eq.
0
)
then
if
(
WATERCYCLE
)
&
call
calculate_watercycle
(
-1
,
itime
)
if
(
mod
(
itime
-
loutstart
,
loutsample
)
.eq.
0
)
then
! If we are exactly at the start or end of the concentration averaging interval,
! give only half the weight to this sample
...
...
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