Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
a96e0f2d
Commit
a96e0f2d
authored
Dec 19, 2017
by
Matthieu Schaller
Browse files
Merge branch 'master' of gitlab.cosma.dur.ac.uk:swift/swiftsim
parents
38b83e2e
ba9fe05e
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/debug.c
View file @
a96e0f2d
...
...
@@ -393,7 +393,7 @@ void dumpCells(const char *prefix, int active, int mpiactive, int pactive,
fclose
(
file
);
}
#ifdef
HAVE_METIS
#if
def
ined(WITH_MPI) && defined(
HAVE_METIS
)
/**
* @brief Dump the METIS graph in standard format, simple format and weights
...
...
src/debug.h
View file @
a96e0f2d
...
...
@@ -39,7 +39,7 @@ int checkCellhdxmax(const struct cell *c, int *depth);
void
dumpCells
(
const
char
*
prefix
,
int
active
,
int
mpiactive
,
int
pactive
,
struct
space
*
s
,
int
rank
,
int
step
);
#ifdef
HAVE_METIS
#if
def
ined(WITH_MPI) && defined(
HAVE_METIS
)
#include
"metis.h"
void
dumpMETISGraph
(
const
char
*
prefix
,
idx_t
nvtxs
,
idx_t
ncon
,
idx_t
*
xadj
,
idx_t
*
adjncy
,
idx_t
*
vwgt
,
idx_t
*
vsize
,
idx_t
*
adjwgt
);
...
...
src/runner.c
View file @
a96e0f2d
...
...
@@ -1001,6 +1001,21 @@ void runner_do_kick1(struct runner *r, struct cell *c, int timer) {
/* do the kick */
kick_part
(
p
,
xp
,
ti_begin
,
ti_begin
+
ti_step
/
2
,
timeBase
);
/* Update the accelerations to be used in the drift for hydro */
if
(
p
->
gpart
!=
NULL
)
{
const
float
a_tot
[
3
]
=
{
p
->
a_hydro
[
0
]
+
p
->
gpart
->
a_grav
[
0
],
p
->
a_hydro
[
1
]
+
p
->
gpart
->
a_grav
[
1
],
p
->
a_hydro
[
2
]
+
p
->
gpart
->
a_grav
[
2
]};
p
->
a_hydro
[
0
]
=
a_tot
[
0
];
p
->
a_hydro
[
1
]
=
a_tot
[
1
];
p
->
a_hydro
[
2
]
=
a_tot
[
2
];
p
->
gpart
->
a_grav
[
0
]
=
a_tot
[
0
];
p
->
gpart
->
a_grav
[
1
]
=
a_tot
[
1
];
p
->
gpart
->
a_grav
[
2
]
=
a_tot
[
2
];
}
}
}
...
...
Write
Preview
Supports
Markdown
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