Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SWIFTsim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SWIFT
SWIFTsim
Commits
03cfe0e7
Commit
03cfe0e7
authored
7 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Updated task plotting script for the new gravity tasks.
parent
d7ad8d65
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!393
Periodic gravity speed and accuracy improvements
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/analyse_tasks.py
+2
-2
2 additions, 2 deletions
examples/analyse_tasks.py
examples/plot_tasks.py
+7
-6
7 additions, 6 deletions
examples/plot_tasks.py
src/task.h
+1
-0
1 addition, 0 deletions
src/task.h
with
10 additions
and
8 deletions
examples/analyse_tasks.py
+
2
−
2
View file @
03cfe0e7
...
...
@@ -50,8 +50,8 @@ infile = args.input
TASKTYPES
=
[
"
none
"
,
"
sort
"
,
"
self
"
,
"
pair
"
,
"
sub_self
"
,
"
sub_pair
"
,
"
init_grav
"
,
"
ghost
"
,
"
extra_ghost
"
,
"
drift_part
"
,
"
drift_gpart
"
,
"
kick1
"
,
"
kick2
"
,
"
timestep
"
,
"
send
"
,
"
recv
"
,
"
grav_top_level
"
,
"
grav_long_range
"
,
"
grav_
mm
"
,
"
grav_
down
"
,
"
cooling
"
,
"
sourceterms
"
,
"
count
"
]
"
grav_top_level
"
,
"
grav_long_range
"
,
"
grav_
ghost
"
,
"
grav_
mm
"
,
"
grav_down
"
,
"
cooling
"
,
"
sourceterms
"
,
"
count
"
]
SUBTYPES
=
[
"
none
"
,
"
density
"
,
"
gradient
"
,
"
force
"
,
"
grav
"
,
"
external_grav
"
,
"
tend
"
,
"
xv
"
,
"
rho
"
,
"
gpart
"
,
"
multipole
"
,
"
spart
"
,
"
count
"
]
...
...
This diff is collapsed.
Click to expand it.
examples/plot_tasks.py
+
7
−
6
View file @
03cfe0e7
...
...
@@ -91,17 +91,18 @@ pl.rcParams.update(PLOT_PARAMS)
TASKTYPES
=
[
"
none
"
,
"
sort
"
,
"
self
"
,
"
pair
"
,
"
sub_self
"
,
"
sub_pair
"
,
"
init_grav
"
,
"
ghost
"
,
"
extra_ghost
"
,
"
drift_part
"
,
"
drift_gpart
"
,
"
kick1
"
,
"
kick2
"
,
"
timestep
"
,
"
send
"
,
"
recv
"
,
"
grav_top_level
"
,
"
grav_long_range
"
,
"
grav_
mm
"
,
"
grav_
down
"
,
"
cooling
"
,
"
sourceterms
"
,
"
count
"
]
"
grav_top_level
"
,
"
grav_long_range
"
,
"
grav_
ghost
"
,
"
grav_
mm
"
,
"
grav_down
"
,
"
cooling
"
,
"
sourceterms
"
,
"
count
"
]
SUBTYPES
=
[
"
none
"
,
"
density
"
,
"
gradient
"
,
"
force
"
,
"
grav
"
,
"
external_grav
"
,
"
tend
"
,
"
xv
"
,
"
rho
"
,
"
gpart
"
,
"
multipole
"
,
"
spart
"
,
"
count
"
]
# Task/subtypes of interest.
FULLTYPES
=
[
"
self/force
"
,
"
self/density
"
,
"
self/grav
"
,
"
sub_self/force
"
,
"
sub_self/density
"
,
"
pair/force
"
,
"
pair/density
"
,
"
pair/grav
"
,
"
sub_pair/force
"
,
"
sub_pair/density
"
,
"
recv/xv
"
,
"
send/xv
"
,
"
recv/rho
"
,
"
send/rho
"
,
"
sub_self/density
"
,
"
sub_self/grav
"
,
"
pair/force
"
,
"
pair/density
"
,
"
pair/grav
"
,
"
sub_pair/force
"
,
"
sub_pair/density
"
,
"
sub_pair/grav
"
,
"
recv/xv
"
,
"
send/xv
"
,
"
recv/rho
"
,
"
send/rho
"
,
"
recv/tend
"
,
"
send/tend
"
]
# A number of colours for the various types. Recycled when there are
...
...
@@ -109,7 +110,7 @@ FULLTYPES = ["self/force", "self/density", "self/grav", "sub_self/force",
colours
=
[
"
cyan
"
,
"
lightgray
"
,
"
darkblue
"
,
"
yellow
"
,
"
tan
"
,
"
dodgerblue
"
,
"
sienna
"
,
"
aquamarine
"
,
"
bisque
"
,
"
blue
"
,
"
green
"
,
"
lightgreen
"
,
"
brown
"
,
"
purple
"
,
"
moccasin
"
,
"
olivedrab
"
,
"
chartreuse
"
,
"
darksag
e
"
,
"
darkgreen
"
,
"
green
"
,
"
mediumseagreen
"
,
"
steelblu
e
"
,
"
darkgreen
"
,
"
green
"
,
"
mediumseagreen
"
,
"
mediumaquamarine
"
,
"
darkslategrey
"
,
"
mediumturquoise
"
,
"
black
"
,
"
cadetblue
"
,
"
skyblue
"
,
"
red
"
,
"
slategray
"
,
"
gold
"
,
"
slateblue
"
,
"
blueviolet
"
,
"
mediumorchid
"
,
"
firebrick
"
,
...
...
This diff is collapsed.
Click to expand it.
src/task.h
+
1
−
0
View file @
03cfe0e7
...
...
@@ -36,6 +36,7 @@
* @brief The different task types.
*
* Be sure to update the taskID_names array in tasks.c if you modify this list!
* Also update the python task plotting scripts!
*/
enum
task_types
{
task_type_none
=
0
,
...
...
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