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
8d8aae94
Commit
8d8aae94
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Temporarily switch off gravity tasks.
parent
6a12eeae
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
examples/main.c
+7
-6
7 additions, 6 deletions
examples/main.c
src/runner.c
+11
-6
11 additions, 6 deletions
src/runner.c
src/task.c
+1
-1
1 addition, 1 deletion
src/task.c
with
19 additions
and
13 deletions
examples/main.c
+
7
−
6
View file @
8d8aae94
...
...
@@ -311,12 +311,13 @@ int main(int argc, char *argv[]) {
/* How large are the parts? */
if
(
myrank
==
0
)
{
message
(
"sizeof(struct part) is %4zi bytes."
,
sizeof
(
struct
part
));
message
(
"sizeof(struct xpart) is %4zi bytes."
,
sizeof
(
struct
xpart
));
message
(
"sizeof(struct spart) is %4zi bytes."
,
sizeof
(
struct
spart
));
message
(
"sizeof(struct gpart) is %4zi bytes."
,
sizeof
(
struct
gpart
));
message
(
"sizeof(struct task) is %4zi bytes."
,
sizeof
(
struct
task
));
message
(
"sizeof(struct cell) is %4zi bytes."
,
sizeof
(
struct
cell
));
message
(
"sizeof(part) is %4zi bytes."
,
sizeof
(
struct
part
));
message
(
"sizeof(xpart) is %4zi bytes."
,
sizeof
(
struct
xpart
));
message
(
"sizeof(spart) is %4zi bytes."
,
sizeof
(
struct
spart
));
message
(
"sizeof(gpart) is %4zi bytes."
,
sizeof
(
struct
gpart
));
message
(
"sizeof(multipole) is %4zi bytes."
,
sizeof
(
struct
multipole
));
message
(
"sizeof(task) is %4zi bytes."
,
sizeof
(
struct
task
));
message
(
"sizeof(cell) is %4zi bytes."
,
sizeof
(
struct
cell
));
}
/* Read the parameter file */
...
...
This diff is collapsed.
Click to expand it.
src/runner.c
+
11
−
6
View file @
8d8aae94
...
...
@@ -113,7 +113,7 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
/* Import the gravity loop functions. */
#include
"runner_doiact_fft.h"
#include
"runner_doiact_grav.h"
//
#include "runner_doiact_grav.h"
/**
* @brief Perform source terms
...
...
@@ -1630,7 +1630,8 @@ void *runner_main(void *data) {
else
if
(
t
->
subtype
==
task_subtype_force
)
runner_doself2_force
(
r
,
ci
);
else
if
(
t
->
subtype
==
task_subtype_grav
)
runner_doself_grav
(
r
,
ci
,
1
);
// runner_doself_grav(r, ci, 1);
;
else
if
(
t
->
subtype
==
task_subtype_external_grav
)
runner_do_grav_external
(
r
,
ci
,
1
);
else
...
...
@@ -1647,7 +1648,8 @@ void *runner_main(void *data) {
else
if
(
t
->
subtype
==
task_subtype_force
)
runner_dopair2_force
(
r
,
ci
,
cj
);
else
if
(
t
->
subtype
==
task_subtype_grav
)
runner_dopair_grav
(
r
,
ci
,
cj
,
1
);
// runner_dopair_grav(r, ci, cj, 1);#
;
else
error
(
"Unknown/invalid task subtype (%d)."
,
t
->
subtype
);
break
;
...
...
@@ -1662,7 +1664,8 @@ void *runner_main(void *data) {
else
if
(
t
->
subtype
==
task_subtype_force
)
runner_dosub_self2_force
(
r
,
ci
,
1
);
else
if
(
t
->
subtype
==
task_subtype_grav
)
runner_dosub_grav
(
r
,
ci
,
cj
,
1
);
// runner_dosub_grav(r, ci, cj, 1);#
;
else
if
(
t
->
subtype
==
task_subtype_external_grav
)
runner_do_grav_external
(
r
,
ci
,
1
);
else
...
...
@@ -1679,7 +1682,8 @@ void *runner_main(void *data) {
else
if
(
t
->
subtype
==
task_subtype_force
)
runner_dosub_pair2_force
(
r
,
ci
,
cj
,
t
->
flags
,
1
);
else
if
(
t
->
subtype
==
task_subtype_grav
)
runner_dosub_grav
(
r
,
ci
,
cj
,
1
);
// runner_dosub_grav(r, ci, cj, 1);
;
else
error
(
"Unknown/invalid task subtype (%d)."
,
t
->
subtype
);
break
;
...
...
@@ -1735,7 +1739,8 @@ void *runner_main(void *data) {
break
;
#endif
case
task_type_grav_mm
:
runner_do_grav_mm
(
r
,
t
->
ci
,
1
);
// runner_do_grav_mm(r, t->ci, 1);
;
break
;
/* case task_type_grav_up: */
/* runner_do_grav_up(r, t->ci); */
...
...
This diff is collapsed.
Click to expand it.
src/task.c
+
1
−
1
View file @
8d8aae94
...
...
@@ -195,7 +195,7 @@ __attribute__((always_inline)) INLINE static enum task_actions task_acts_on(
break
;
}
/* Silence compile warnings */
/* Silence compile
r
warnings */
error
(
"Unknown task_action for task"
);
return
task_action_none
;
}
...
...
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