Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pystencils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tom Harke
pystencils
Commits
fcdfc127
Commit
fcdfc127
authored
5 years ago
by
Michael Kuron
Committed by
Michael Kuron
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove unneeded ghost layers from staggered kernel
parent
6dab2755
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pystencils/kernelcreation.py
+19
-4
19 additions, 4 deletions
pystencils/kernelcreation.py
pystencils_tests/test_staggered_diffusion.py
+3
-2
3 additions, 2 deletions
pystencils_tests/test_staggered_diffusion.py
with
22 additions
and
6 deletions
pystencils/kernelcreation.py
+
19
−
4
View file @
fcdfc127
...
...
@@ -333,16 +333,32 @@ def create_staggered_kernel_2(assignments, **kwargs):
final_assignments
=
[]
# find out whether any of the ghost layers is not needed
common_exclusions
=
set
([
"
E
"
,
"
W
"
,
"
N
"
,
"
S
"
,
"
T
"
,
"
B
"
][:
2
*
dim
])
for
direction
in
staggered_field
.
staggered_stencil
:
exclusions
=
set
([
"
E
"
,
"
W
"
,
"
N
"
,
"
S
"
,
"
T
"
,
"
B
"
][:
2
*
dim
])
for
elementary_direction
in
direction
:
exclusions
.
remove
(
inverse_direction_string
(
elementary_direction
))
common_exclusions
.
intersection_update
(
exclusions
)
ghost_layers
=
[[
1
,
1
]
for
d
in
range
(
dim
)]
for
direction
in
common_exclusions
:
direction
=
direction_string_to_offset
(
direction
)
for
d
,
s
in
enumerate
(
direction
):
if
s
==
1
:
ghost_layers
[
d
][
1
]
=
0
elif
s
==
-
1
:
ghost_layers
[
d
][
0
]
=
0
def
condition
(
direction
):
"""
exclude those staggered points that correspond to fluxes between ghost cells
"""
exclusions
=
set
([
"
E
"
,
"
W
"
,
"
N
"
,
"
S
"
])
if
dim
==
3
:
exclusions
.
update
(
"
T
"
,
"
B
"
)
exclusions
=
set
([
"
E
"
,
"
W
"
,
"
N
"
,
"
S
"
,
"
T
"
,
"
B
"
][:
2
*
dim
])
for
elementary_direction
in
direction
:
exclusions
.
remove
(
inverse_direction_string
(
elementary_direction
))
conditions
=
[]
for
e
in
exclusions
:
if
e
in
common_exclusions
:
continue
offset
=
direction_string_to_offset
(
e
)
for
i
,
o
in
enumerate
(
offset
):
if
o
==
1
:
...
...
@@ -357,6 +373,5 @@ def create_staggered_kernel_2(assignments, **kwargs):
last_conditional
=
Conditional
(
condition
(
direction
),
Block
(
sp_assignments
))
final_assignments
.
append
(
last_conditional
)
ghost_layers
=
[(
1
,
0
)]
*
dim
ast
=
create_kernel
(
final_assignments
,
ghost_layers
=
ghost_layers
,
**
kwargs
)
return
ast
This diff is collapsed.
Click to expand it.
pystencils_tests/test_staggered_diffusion.py
+
3
−
2
View file @
fcdfc127
import
pystencils
as
ps
import
numpy
as
np
import
sympy
as
sp
class
TestDiffusion
:
...
...
@@ -20,8 +21,8 @@ class TestDiffusion:
xY_staggered
=
-
c
[
-
1
,
1
]
+
c
[
0
,
0
]
jj
=
j
.
staggered_access
divergence
=
-
1
*
D
/
(
1
+
n
p
.
sqrt
(
2
)
if
j
.
index_shape
[
0
]
==
4
else
1
)
*
\
sum
([
jj
(
d
)
/
n
p
.
linalg
.
norm
(
ps
.
stencil
.
direction_string_to_offset
(
d
))
for
d
in
j
.
staggered_stencil
divergence
=
-
1
*
D
/
(
1
+
s
p
.
sqrt
(
2
)
if
j
.
index_shape
[
0
]
==
4
else
1
)
*
\
sum
([
jj
(
d
)
/
s
p
.
Matrix
(
ps
.
stencil
.
direction_string_to_offset
(
d
))
.
norm
()
for
d
in
j
.
staggered_stencil
+
[
ps
.
stencil
.
inverse_direction_string
(
d
)
for
d
in
j
.
staggered_stencil
]])
update
=
[
ps
.
Assignment
(
c
.
center
,
c
.
center
+
dt
*
divergence
)]
...
...
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