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
6473ad39
Commit
6473ad39
authored
Feb 09, 2017
by
Sabine
Browse files
BUGFIX: add max(xscav1) to all write statements
parent
75a4dedb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/conccalc.f90
View file @
6473ad39
...
...
@@ -384,7 +384,7 @@ subroutine conccalc(itime,weight)
do
ks
=
1
,
nspec
griduncn
(
ix
,
jyp
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
=
&
griduncn
(
ix
,
jyp
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
+
&
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
xscav_frac1
(
i
,
ks
)
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
max
(
xscav_frac1
(
i
,
ks
)
,
0.0
)
end
do
else
do
ks
=
1
,
nspec
...
...
@@ -404,7 +404,7 @@ subroutine conccalc(itime,weight)
do
ks
=
1
,
nspec
griduncn
(
ixp
,
jyp
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
=
&
griduncn
(
ixp
,
jyp
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
+
&
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
xscav_frac1
(
i
,
ks
)
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
max
(
xscav_frac1
(
i
,
ks
)
,
0.0
)
end
do
else
do
ks
=
1
,
nspec
...
...
@@ -421,7 +421,7 @@ subroutine conccalc(itime,weight)
do
ks
=
1
,
nspec
griduncn
(
ixp
,
jy
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
=
&
griduncn
(
ixp
,
jy
,
kz
,
ks
,
nrelpointer
,
nclass
(
i
),
nage
)
+
&
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
xscav_frac1
(
i
,
ks
)
xmass1
(
i
,
ks
)/
rhoi
*
weight
*
w
*
max
(
xscav_frac1
(
i
,
ks
)
,
0.0
)
end
do
else
do
ks
=
1
,
nspec
...
...
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