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
915c6fbd
Commit
915c6fbd
authored
8 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
No unwanted changes
parent
b740f32d
No related branches found
No related tags found
2 merge requests
!272
Added README files to examples
,
!271
Stats include external potential energy
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
src/cell.h
+0
-1
0 additions, 1 deletion
src/cell.h
src/space.c
+1
-4
1 addition, 4 deletions
src/space.c
src/task.c
+1
-0
1 addition, 0 deletions
src/task.c
src/task.h
+0
-1
0 additions, 1 deletion
src/task.h
src/units.c
+3
-0
3 additions, 0 deletions
src/units.c
src/units.h
+0
-1
0 additions, 1 deletion
src/units.h
with
5 additions
and
7 deletions
src/cell.h
+
0
−
1
View file @
915c6fbd
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
* 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
* 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
* 2016 John A. Regan (john.a.regan@durham.ac.uk)
* 2016 John A. Regan (john.a.regan@durham.ac.uk)
* Tom Theuns (tom.theuns@durham.ac.uk)
* Tom Theuns (tom.theuns@durham.ac.uk)
* Stefan Arridge (stefan.arridge@durham.ac.uk)
*
*
* This program is free software: you can redistribute it and/or modify
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* it under the terms of the GNU Lesser General Public License as published
...
...
This diff is collapsed.
Click to expand it.
src/space.c
+
1
−
4
View file @
915c6fbd
...
@@ -1814,11 +1814,8 @@ void space_init(struct space *s, const struct swift_params *params,
...
@@ -1814,11 +1814,8 @@ void space_init(struct space *s, const struct swift_params *params,
}
else
{
}
else
{
for
(
size_t
k
=
0
;
k
<
Npart
;
k
++
)
for
(
size_t
k
=
0
;
k
<
Npart
;
k
++
)
for
(
int
j
=
0
;
j
<
3
;
j
++
)
for
(
int
j
=
0
;
j
<
3
;
j
++
)
if
(
parts
[
k
].
x
[
j
]
<
0
||
parts
[
k
].
x
[
j
]
>=
dim
[
j
])
{
if
(
parts
[
k
].
x
[
j
]
<
0
||
parts
[
k
].
x
[
j
]
>=
dim
[
j
])
printf
(
"parts[%lld].x[%d] = %f , dim[%d] = %f
\n
"
,
k
,
j
,
parts
[
k
].
x
[
j
],
j
,
dim
[
j
]);
error
(
"Not all particles are within the specified domain."
);
error
(
"Not all particles are within the specified domain."
);
}
}
}
/* Same for the gparts */
/* Same for the gparts */
...
...
This diff is collapsed.
Click to expand it.
src/task.c
+
1
−
0
View file @
915c6fbd
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
/* This object's header. */
/* This object's header. */
#include
"task.h"
#include
"task.h"
/* Local headers. */
/* Local headers. */
#include
"atomic.h"
#include
"atomic.h"
#include
"error.h"
#include
"error.h"
...
...
This diff is collapsed.
Click to expand it.
src/task.h
+
0
−
1
View file @
915c6fbd
...
@@ -53,7 +53,6 @@ enum task_types {
...
@@ -53,7 +53,6 @@ enum task_types {
task_type_grav_fft
,
task_type_grav_fft
,
task_type_grav_mm
,
task_type_grav_mm
,
task_type_grav_up
,
task_type_grav_up
,
task_type_grav_external
,
task_type_cooling
,
task_type_cooling
,
task_type_sourceterms
,
task_type_sourceterms
,
task_type_count
task_type_count
...
...
This diff is collapsed.
Click to expand it.
src/units.c
+
3
−
0
View file @
915c6fbd
...
@@ -320,6 +320,9 @@ void units_get_base_unit_exponants_array(float baseUnitsExp[5],
...
@@ -320,6 +320,9 @@ void units_get_base_unit_exponants_array(float baseUnitsExp[5],
case
UNIT_CONV_VOLUME
:
case
UNIT_CONV_VOLUME
:
baseUnitsExp
[
UNIT_LENGTH
]
=
3
.
f
;
baseUnitsExp
[
UNIT_LENGTH
]
=
3
.
f
;
case
UNIT_CONV_INV_VOLUME
:
baseUnitsExp
[
UNIT_LENGTH
]
=
-
3
.
f
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/units.h
+
0
−
1
View file @
915c6fbd
...
@@ -59,7 +59,6 @@ enum BaseUnits {
...
@@ -59,7 +59,6 @@ enum BaseUnits {
UNIT_LENGTH
=
1
,
UNIT_LENGTH
=
1
,
UNIT_TIME
=
2
,
UNIT_TIME
=
2
,
UNIT_CURRENT
=
3
,
UNIT_CURRENT
=
3
,
UNIT_TEMPERATURE
=
4
UNIT_TEMPERATURE
=
4
};
};
...
...
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