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
b0e6e330
Commit
b0e6e330
authored
1 year ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Code formatting
parent
60b3424b
No related branches found
No related tags found
5 merge requests
!1997
Yet another master into zoom buffer branch merge (with formatting all done!)
,
!1994
Draft: Testing master -> zoom merge
,
!1987
Update zoom_merge with master updates (after wrangling immense conflicts)
,
!1982
Update zoom merge branch with latest master developments
,
!1956
Rename space_getsid to space_getsid_and_swap_cells() to try to prevent...
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/common_io_fields.c
+3
-3
3 additions, 3 deletions
src/common_io_fields.c
src/scheduler.c
+2
-1
2 additions, 1 deletion
src/scheduler.c
src/space_getsid.h
+3
-3
3 additions, 3 deletions
src/space_getsid.h
with
8 additions
and
7 deletions
src/common_io_fields.c
+
3
−
3
View file @
b0e6e330
...
@@ -400,9 +400,9 @@ void io_write_output_field_parameter(const char* filename, int with_cosmology,
...
@@ -400,9 +400,9 @@ void io_write_output_field_parameter(const char* filename, int with_cosmology,
strcpy
(
&
comment_write_buffer
[
PARSER_MAX_LINE_SIZE
/
2
-
4
],
"..."
);
strcpy
(
&
comment_write_buffer
[
PARSER_MAX_LINE_SIZE
/
2
-
4
],
"..."
);
}
}
fprintf
(
file
,
" %s_%s: %s # (%dD - %zd bytes / dim) %s : %s
\n
"
,
list
[
i
].
name
,
fprintf
(
file
,
" %s_%s: %s # (%dD - %zd bytes / dim) %s : %s
\n
"
,
part_type_names
[
ptype
],
"on"
,
list
[
i
].
dimension
,
io_sizeof_type
(
list
[
i
].
type
),
list
[
i
].
name
,
part_type_names
[
ptype
],
"on"
,
list
[
i
].
dimension
,
comment_write_buffer
,
unit_buffer
);
io_sizeof_type
(
list
[
i
].
type
),
comment_write_buffer
,
unit_buffer
);
}
}
fprintf
(
file
,
"
\n
"
);
fprintf
(
file
,
"
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
src/scheduler.c
+
2
−
1
View file @
b0e6e330
...
@@ -1374,7 +1374,8 @@ static void scheduler_splittask_hydro(struct task *t, struct scheduler *s) {
...
@@ -1374,7 +1374,8 @@ static void scheduler_splittask_hydro(struct task *t, struct scheduler *s) {
scheduler_addtask
(
s
,
task_type_pair
,
t
->
subtype
,
0
,
0
,
scheduler_addtask
(
s
,
task_type_pair
,
t
->
subtype
,
0
,
0
,
ci
->
progeny
[
j
],
cj
->
progeny
[
k
]);
ci
->
progeny
[
j
],
cj
->
progeny
[
k
]);
scheduler_splittask_hydro
(
tl
,
s
);
scheduler_splittask_hydro
(
tl
,
s
);
tl
->
flags
=
space_getsid_and_swap_cells
(
s
->
space
,
&
t
->
ci
,
&
t
->
cj
,
shift
);
tl
->
flags
=
space_getsid_and_swap_cells
(
s
->
space
,
&
t
->
ci
,
&
t
->
cj
,
shift
);
}
}
}
}
}
/* pair interaction? */
}
/* pair interaction? */
...
...
This diff is collapsed.
Click to expand it.
src/space_getsid.h
+
3
−
3
View file @
b0e6e330
...
@@ -43,9 +43,9 @@
...
@@ -43,9 +43,9 @@
*
*
* @return The shift ID and set shift, may or may not swap ci and cj.
* @return The shift ID and set shift, may or may not swap ci and cj.
*/
*/
__attribute__
((
always_inline
,
nonnull
))
INLINE
static
int
space_getsid_and_swap_cells
(
__attribute__
((
always_inline
,
nonnull
))
INLINE
static
int
const
struct
space
*
s
,
struct
cell
**
ci
,
struct
cell
**
cj
,
space_getsid_and_swap_cells
(
const
struct
space
*
s
,
struct
cell
**
ci
,
double
shift
[
3
])
{
struct
cell
**
cj
,
double
shift
[
3
])
{
/* Get the relative distance between the pairs, wrapping. */
/* Get the relative distance between the pairs, wrapping. */
const
int
periodic
=
s
->
periodic
;
const
int
periodic
=
s
->
periodic
;
...
...
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