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
ce6b6c58
Commit
ce6b6c58
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Make the ID of the Gizmo-particles a long long and not unsigned long long
parent
68cbf747
No related branches found
No related tags found
1 merge request
!223
Merge Gizmo-SPH into the master branch
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/const.h
+6
-7
6 additions, 7 deletions
src/const.h
src/hydro/Gizmo/hydro_part.h
+1
-1
1 addition, 1 deletion
src/hydro/Gizmo/hydro_part.h
src/runner.c
+10
-2
10 additions, 2 deletions
src/runner.c
with
17 additions
and
10 deletions
src/const.h
+
6
−
7
View file @
ce6b6c58
...
...
@@ -63,23 +63,22 @@
/* SPH variant to use */
//#define MINIMAL_SPH
//
#define GADGET2_SPH
#define GADGET2_SPH
//#define DEFAULT_SPH
#define GIZMO_SPH
//
#define GIZMO_SPH
/* Riemann solver to use (GIZMO_SPH only) */
#define RIEMANN_SOLVER_EXACT
//#define RIEMANN_SOLVER_TRRS
//#define RIEMANN_SOLVER_HLLC
/* Type of gradients to use (GIZMO_SPH only)
If no option is chosen, no gradients are used (first order scheme) */
/* Type of gradients to use (GIZMO_SPH only)
*/
/*
If no option is chosen, no gradients are used (first order scheme) */
//#define GRADIENTS_SPH
#define GRADIENTS_GIZMO
/* Types of slope limiter to use (GIZMO_SPH only)
Different slope limiters can be combined, so multiple options may
be selected */
/* Types of slope limiter to use (GIZMO_SPH only) */
/* Different slope limiters can be combined */
#define SLOPE_LIMITER_PER_FACE
#define SLOPE_LIMITER_CELL_WIDE
...
...
This diff is collapsed.
Click to expand it.
src/hydro/Gizmo/hydro_part.h
+
1
−
1
View file @
ce6b6c58
...
...
@@ -196,7 +196,7 @@ struct part {
float
mass
;
/* Particle ID. */
unsigned
long
long
id
;
long
long
id
;
/* Associated gravitas. */
struct
gpart
*
gpart
;
...
...
This diff is collapsed.
Click to expand it.
src/runner.c
+
10
−
2
View file @
ce6b6c58
...
...
@@ -82,8 +82,8 @@ const char runner_flip[27] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
#define FUNCTION density
#include
"runner_doiact.h"
/* Import the gradient loop functions (if required). */
#ifdef EXTRA_HYDRO_LOOP
/* Import the gradient loop functions. */
#undef FUNCTION
#define FUNCTION gradient
#include
"runner_doiact.h"
...
...
@@ -436,7 +436,9 @@ void runner_do_init(struct runner *r, struct cell *c, int timer) {
* @param c The cell.
*/
void
runner_do_extra_ghost
(
struct
runner
*
r
,
struct
cell
*
c
)
{
#ifdef EXTRA_HYDRO_LOOP
struct
part
*
restrict
parts
=
c
->
parts
;
const
int
count
=
c
->
count
;
const
int
ti_current
=
r
->
e
->
ti_current
;
...
...
@@ -461,6 +463,9 @@ void runner_do_extra_ghost(struct runner *r, struct cell *c) {
}
}
}
#else
error
(
"SWIFT was not compiled with the extra hydro loop activated."
);
#endif
}
...
...
@@ -1131,7 +1136,8 @@ void *runner_main(void *data) {
/* Different types of tasks... */
switch
(
t
->
type
)
{
case
task_type_self
:
if
(
t
->
subtype
==
task_subtype_density
)
runner_doself1_density
(
r
,
ci
);
if
(
t
->
subtype
==
task_subtype_density
)
runner_doself1_density
(
r
,
ci
);
#ifdef EXTRA_HYDRO_LOOP
else
if
(
t
->
subtype
==
task_subtype_gradient
)
runner_doself1_gradient
(
r
,
ci
);
...
...
@@ -1194,9 +1200,11 @@ void *runner_main(void *data) {
case
task_type_ghost
:
runner_do_ghost
(
r
,
ci
);
break
;
#ifdef EXTRA_HYDRO_LOOP
case
task_type_extra_ghost
:
runner_do_extra_ghost
(
r
,
ci
);
break
;
#endif
case
task_type_kick
:
runner_do_kick
(
r
,
ci
,
1
);
break
;
...
...
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