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
2ff622ff
Commit
2ff622ff
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Move the sid_scale definition to sort_part.h
parent
271f400c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!340
Split the drift into hydro and gravity drift tasks. Implement FFT task and dependencies
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/scheduler.c
+0
-6
0 additions, 6 deletions
src/scheduler.c
src/sort_part.h
+5
-0
5 additions, 0 deletions
src/sort_part.h
with
5 additions
and
6 deletions
src/scheduler.c
+
0
−
6
View file @
2ff622ff
...
@@ -125,9 +125,6 @@ static void scheduler_splittask(struct task *t, struct scheduler *s) {
...
@@ -125,9 +125,6 @@ static void scheduler_splittask(struct task *t, struct scheduler *s) {
{
-
1
,
-
1
,
-
1
,
12
,
7
,
6
,
4
,
3
},
{
-
1
,
-
1
,
-
1
,
-
1
,
8
,
7
,
5
,
4
},
{
-
1
,
-
1
,
-
1
,
12
,
7
,
6
,
4
,
3
},
{
-
1
,
-
1
,
-
1
,
-
1
,
8
,
7
,
5
,
4
},
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
12
,
10
,
9
},
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
11
,
10
},
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
12
,
10
,
9
},
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
11
,
10
},
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
12
}};
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
12
}};
static
const
float
sid_scale
[
13
]
=
{
0
.
1897
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
5788
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
5788
f
,
0
.
4025
f
,
0
.
5788
f
};
/* Iterate on this task until we're done with it. */
/* Iterate on this task until we're done with it. */
int
redo
=
1
;
int
redo
=
1
;
...
@@ -976,9 +973,6 @@ void scheduler_reweight(struct scheduler *s, int verbose) {
...
@@ -976,9 +973,6 @@ void scheduler_reweight(struct scheduler *s, int verbose) {
int
*
tid
=
s
->
tasks_ind
;
int
*
tid
=
s
->
tasks_ind
;
struct
task
*
tasks
=
s
->
tasks
;
struct
task
*
tasks
=
s
->
tasks
;
const
int
nodeID
=
s
->
nodeID
;
const
int
nodeID
=
s
->
nodeID
;
const
float
sid_scale
[
13
]
=
{
0
.
1897
,
0
.
4025
,
0
.
1897
,
0
.
4025
,
0
.
5788
,
0
.
4025
,
0
.
1897
,
0
.
4025
,
0
.
1897
,
0
.
4025
,
0
.
5788
,
0
.
4025
,
0
.
5788
};
const
float
wscale
=
0
.
001
;
const
float
wscale
=
0
.
001
;
const
ticks
tic
=
getticks
();
const
ticks
tic
=
getticks
();
...
...
This diff is collapsed.
Click to expand it.
src/sort_part.h
+
5
−
0
View file @
2ff622ff
...
@@ -83,6 +83,11 @@ static const int sortlistID[27] = {
...
@@ -83,6 +83,11 @@ static const int sortlistID[27] = {
/* ( 1 , 1 , 0 ) */
1
,
/* ( 1 , 1 , 0 ) */
1
,
/* ( 1 , 1 , 1 ) */
0
};
/* ( 1 , 1 , 1 ) */
0
};
/* Ratio of particles interacting assuming a uniform distribution */
static
const
float
sid_scale
[
13
]
=
{
0
.
1897
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
5788
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
1897
f
,
0
.
4025
f
,
0
.
5788
f
,
0
.
4025
f
,
0
.
5788
f
};
/**
/**
* @brief Determines whether a pair of cells are corner to corner.
* @brief Determines whether a pair of cells are corner to corner.
*
*
...
...
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