Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flexpart
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin Püschel
Flexpart
Commits
0014b1e0
Commit
0014b1e0
authored
1 year ago
by
Lucie Bakels
Browse files
Options
Downloads
Patches
Plain Diff
settling threshold only for forward runs
Former-commit-id:
7297d126
parent
993efdd9
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/advance_mod.f90
+7
-5
7 additions, 5 deletions
src/advance_mod.f90
with
7 additions
and
5 deletions
src/advance_mod.f90
+
7
−
5
View file @
0014b1e0
...
...
@@ -410,14 +410,14 @@ subroutine adv_above_pbl(itime,itimec,dxsave,dysave,ux,vy,tropop,nrand,ipart)
call
get_settling
(
xts
,
yts
,
zts
,
nsp
,
part
(
ipart
)
%
settling
)
#ifdef ETA
call
update_zeta_to_z
(
itime
,
ipart
)
if
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
)
then
if
((
ldirect
.eq.
1
)
.and.
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
.
)
)
then
part
(
ipart
)
%
settling
=-
part
(
ipart
)
%
z
/
dt
endif
call
w_to_weta
(
itime
,
dt
,
part
(
ipart
)
%
xlon
,
part
(
ipart
)
%
ylat
,
&
part
(
ipart
)
%
z
,
part
(
ipart
)
%
zeta
,
part
(
ipart
)
%
settling
,
weta_settling
)
weta
=
weta
+
weta_settling
#else
if
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
)
then
if
((
ldirect
.eq.
1
)
.and.
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
.
)
)
then
part
(
ipart
)
%
settling
=-
part
(
ipart
)
%
z
/
dt
endif
w
=
w
+
part
(
ipart
)
%
settling
...
...
@@ -592,7 +592,7 @@ subroutine adv_in_pbl(itime,itimec, dxsave,dysave,dawsave,dcwsave, abovePBL, &
endif
if
(
density
(
nsp
)
.gt.
0.
)
then
call
get_settling
(
xts
,
yts
,
zts
,
nsp
,
part
(
ipart
)
%
settling
)
!bugfix
if
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
)
then
if
((
ldirect
.eq.
1
)
.and.
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
dt
.lt.
0
.
)
)
then
part
(
ipart
)
%
settling
=-
part
(
ipart
)
%
z
/
dt
endif
w
=
w
+
part
(
ipart
)
%
settling
...
...
@@ -721,7 +721,8 @@ subroutine petterssen_corr(itime,ipart)
call
update_z_to_zeta
(
itime
+
part
(
ipart
)
%
idt
,
ipart
)
zts
=
real
(
part
(
ipart
)
%
z
)
call
get_settling
(
xts
,
yts
,
zts
,
nsp
,
part
(
ipart
)
%
settling
)
!bugfix
if
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
part
(
ipart
)
%
idt
.lt.
0
)
then
if
((
ldirect
.eq.
1
)
.and.
&
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
part
(
ipart
)
%
idt
.lt.
0
))
then
part
(
ipart
)
%
settling
=-
part
(
ipart
)
%
z
/
part
(
ipart
)
%
idt
endif
call
w_to_weta
(
&
...
...
@@ -733,7 +734,8 @@ subroutine petterssen_corr(itime,ipart)
!real(part(ipart)%zeta-part(ipart)%zeta_prev)/real(part(ipart)%idt*ldirect)
#else
call
get_settling
(
xts
,
yts
,
zts
,
nsp
,
part
(
ipart
)
%
settling
)
if
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
part
(
ipart
)
%
idt
.lt.
0
)
then
if
((
ldirect
.eq.
1
)
.and.
&
(
part
(
ipart
)
%
z
+
part
(
ipart
)
%
settling
*
part
(
ipart
)
%
idt
.lt.
0
))
then
part
(
ipart
)
%
settling
=-
part
(
ipart
)
%
z
/
part
(
ipart
)
%
idt
endif
w
=
w
+
part
(
ipart
)
%
settling
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment