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
00084b45
Commit
00084b45
authored
9 years ago
by
Matthieu Schaller
Browse files
Options
Downloads
Patches
Plain Diff
Code formatting
parent
e7d42bcd
No related branches found
No related tags found
1 merge request
!128
Parallel gpart sort
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/serial_io.c
+3
-3
3 additions, 3 deletions
src/serial_io.c
src/serial_io.h
+3
-3
3 additions, 3 deletions
src/serial_io.h
src/single_io.c
+2
-3
2 additions, 3 deletions
src/single_io.c
src/single_io.h
+2
-1
2 additions, 1 deletion
src/single_io.h
with
10 additions
and
10 deletions
src/serial_io.c
+
3
−
3
View file @
00084b45
...
...
@@ -410,9 +410,9 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
* Calls #error() if an error occurs.
*
*/
void
read_ic_serial
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
size_t
*
N
,
int
*
periodic
,
int
mpi_rank
,
int
mpi_size
,
MPI_Comm
comm
,
MPI_Info
info
)
{
void
read_ic_serial
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
size_t
*
N
,
int
*
periodic
,
int
mpi_rank
,
int
mpi_size
,
MPI_Comm
comm
,
MPI_Info
info
)
{
hid_t
h_file
=
0
,
h_grp
=
0
;
double
boxSize
[
3
]
=
{
0
.
0
,
-
1
.
0
,
-
1
.
0
};
/* GADGET has only cubic boxes (in cosmological mode) */
...
...
This diff is collapsed.
Click to expand it.
src/serial_io.h
+
3
−
3
View file @
00084b45
...
...
@@ -31,9 +31,9 @@
#if defined(HAVE_HDF5) && defined(WITH_MPI) && !defined(HAVE_PARALLEL_HDF5)
void
read_ic_serial
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
size_t
*
N
,
int
*
periodic
,
int
mpi_rank
,
int
mpi_size
,
MPI_Comm
comm
,
MPI_Info
info
);
void
read_ic_serial
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
size_t
*
N
,
int
*
periodic
,
int
mpi_rank
,
int
mpi_size
,
MPI_Comm
comm
,
MPI_Info
info
);
void
write_output_serial
(
struct
engine
*
e
,
struct
UnitSystem
*
us
,
int
mpi_rank
,
int
mpi_size
,
MPI_Comm
comm
,
MPI_Info
info
);
...
...
This diff is collapsed.
Click to expand it.
src/single_io.c
+
2
−
3
View file @
00084b45
...
...
@@ -474,9 +474,8 @@ void write_output_single(struct engine* e, struct UnitSystem* us) {
/* Number of particles of each type */
const
size_t
Ndm
=
Ntot
-
Ngas
;
int
numParticles
[
NUM_PARTICLE_TYPES
]
=
/* Gadget-2 convention here */
{
Ngas
,
Ndm
,
0
};
/* Could use size_t instead */
int
numParticlesHighWord
[
NUM_PARTICLE_TYPES
]
=
{
0
};
{
Ngas
,
Ndm
,
0
};
/* Could use size_t instead */
int
numParticlesHighWord
[
NUM_PARTICLE_TYPES
]
=
{
0
};
/* File name */
char
fileName
[
FILENAME_BUFFER_SIZE
];
...
...
This diff is collapsed.
Click to expand it.
src/single_io.h
+
2
−
1
View file @
00084b45
...
...
@@ -27,7 +27,8 @@
#if defined(HAVE_HDF5) && !defined(WITH_MPI)
void
read_ic_single
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
struct
gpart
**
gparts
,
size_t
*
Ngas
,
size_t
*
Ndm
,
int
*
periodic
);
struct
gpart
**
gparts
,
size_t
*
Ngas
,
size_t
*
Ndm
,
int
*
periodic
);
void
write_output_single
(
struct
engine
*
e
,
struct
UnitSystem
*
us
);
...
...
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