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
2bec33ef
Commit
2bec33ef
authored
May 08, 2017
by
Sabine
Browse files
resolved kernel merge: removed all uskernel
parent
6985a986
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/com_mod.f90
View file @
2bec33ef
...
...
@@ -755,7 +755,6 @@ module com_mod
integer
::
mpi_mode
=
0
! .gt. 0 if running MPI version
logical
::
lroot
=
.true.
! true if serial version, or if MPI .and. root process
logical
::
usekernel
=
.false.
! true if the output kernel shall be switched on
logical
::
interpolhmix
=
.false.
! true if the hmix shall be interpolated
logical
::
turboff
=
.false.
! true if the turbulence shall be switched off
...
...
src/conccalc.f90
View file @
2bec33ef
...
...
@@ -182,7 +182,7 @@ subroutine conccalc(itime,weight)
if
(
lnokernel
.or.
(
itage
.lt.
10800
)
.or.
(
xl
.lt.
0.5
)
.or.
(
yl
.lt.
0.5
)
.or.
&
(
xl
.gt.
real
(
numxgrid
-1
)
-0.5
)
.or.
&
(
yl
.gt.
real
(
numygrid
-1
)
-0.5
))
)
then
! no kernel, direct attribution to grid cell
(
yl
.gt.
real
(
numygrid
-1
)
-0.5
))
then
! no kernel, direct attribution to grid cell
if
((
ix
.ge.
0
)
.and.
(
jy
.ge.
0
)
.and.
(
ix
.le.
numxgrid
-1
)
.and.
&
(
jy
.le.
numygrid
-1
))
then
if
(
DRYBKDEP
.or.
WETBKDEP
)
then
...
...
@@ -319,7 +319,7 @@ subroutine conccalc(itime,weight)
if
((
itage
.lt.
10800
)
.or.
(
xl
.lt.
0.5
)
.or.
(
yl
.lt.
0.5
)
.or.
&
(
xl
.gt.
real
(
numxgridn
-1
)
-0.5
)
.or.
&
(
yl
.gt.
real
(
numygridn
-1
)
-0.5
)
.or.
(
.
no
t.
use
kernel
))
then
! no kernel, direct attribution to grid cell
(
yl
.gt.
real
(
numygridn
-1
)
-0.5
)
.or.
(
l
nokernel
))
then
! no kernel, direct attribution to grid cell
if
((
ix
.ge.
0
)
.and.
(
jy
.ge.
0
)
.and.
(
ix
.le.
numxgridn
-1
)
.and.
&
(
jy
.le.
numygridn
-1
))
then
if
(
DRYBKDEP
.or.
WETBKDEP
)
then
...
...
src/drydepokernel.f90
View file @
2bec33ef
...
...
@@ -101,10 +101,6 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
if
((
abs
(
deposit
(
ks
))
.gt.
0
)
.and.
DRYDEPSPEC
(
ks
))
then
if
(
.not.
usekernel
)
then
drygridunc
(
ix
,
jy
,
ks
,
kp
,
nunc
,
nage
)
=
&
drygridunc
(
ix
,
jy
,
ks
,
kp
,
nunc
,
nage
)
+
deposit
(
ks
)
else
if
((
ix
.ge.
0
)
.and.
(
jy
.ge.
0
)
.and.
(
ix
.le.
numxgrid
-1
)
.and.
&
(
jy
.le.
numygrid
-1
))
then
w
=
wx
*
wy
...
...
@@ -133,9 +129,7 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
drygridunc
(
ix
,
jyp
,
ks
,
kp
,
nunc
,
nage
)
+
deposit
(
ks
)
*
w
endif
endif
! kernel
endif
! deposit>0
end
do
end
if
...
...
src/timemanager.f90
View file @
2bec33ef
...
...
@@ -146,7 +146,7 @@ subroutine timemanager
! print*, 'Initialized lifetime'
!CGZ-lifetime: set lifetime to 0
if
(
.
no
t.
use
kernel
)
write
(
*
,
*
)
'Not using the kernel'
if
(
l
nokernel
)
write
(
*
,
*
)
'Not using the kernel'
if
(
turboff
)
write
(
*
,
*
)
'Turbulence switched off'
write
(
*
,
46
)
float
(
itime
)/
3600
,
itime
,
numpart
...
...
src/wetdepokernel.f90
View file @
2bec33ef
...
...
@@ -94,10 +94,6 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp)
do
ks
=
1
,
nspec
if
(
.not.
usekernel
)
then
wetgridunc
(
ix
,
jy
,
ks
,
kp
,
nunc
,
nage
)
=
&
wetgridunc
(
ix
,
jy
,
ks
,
kp
,
nunc
,
nage
)
+
deposit
(
ks
)
else
if
((
ix
.ge.
0
)
.and.
(
jy
.ge.
0
)
.and.
(
ix
.le.
numxgrid
-1
)
.and.
&
(
jy
.le.
numygrid
-1
))
then
w
=
wx
*
wy
...
...
@@ -125,7 +121,7 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp)
wetgridunc
(
ix
,
jyp
,
ks
,
kp
,
nunc
,
nage
)
=
&
wetgridunc
(
ix
,
jyp
,
ks
,
kp
,
nunc
,
nage
)
+
deposit
(
ks
)
*
w
endif
endif
end
do
end
if
...
...
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