Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flexpart
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
flexpart
flexpart
Commits
2bec33ef
Commit
2bec33ef
authored
May 08, 2017
by
Sabine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolved kernel merge: removed all uskernel
parent
6985a986
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
15 deletions
+4
-15
src/com_mod.f90
src/com_mod.f90
+0
-1
src/conccalc.f90
src/conccalc.f90
+2
-2
src/drydepokernel.f90
src/drydepokernel.f90
+0
-6
src/timemanager.f90
src/timemanager.f90
+1
-1
src/wetdepokernel.f90
src/wetdepokernel.f90
+1
-5
No files found.
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.
(
.not.
use
kernel
))
then
! no kernel, direct attribution to grid cell
(
yl
.gt.
real
(
numygridn
-1
)
-0.5
)
.or.
(
lno
kernel
))
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
(
.not.
use
kernel
)
write
(
*
,
*
)
'Not using the kernel'
if
(
lno
kernel
)
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
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