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
6fae7e8e
Commit
6fae7e8e
authored
Sep 15, 2016
by
Matthieu Schaller
Browse files
Merge branch 'master' into error_messages
parents
ee87c1bb
d58bef3c
Changes
4
Hide whitespace changes
Inline
Side-by-side
examples/EAGLE_25/README
View file @
6fae7e8e
...
...
@@ -13,4 +13,4 @@ The particle load of the main EAGLE simulation can be reproduced by
running these ICs on 64 cores.
MD5 checksum of the ICs:
ada2c728db2bd2d77a20c4eef52dfaf1
EAGLE_ICs_25.hdf5
02cd1c353b86230af047b5d4ab22afcf
EAGLE_ICs_25.hdf5
src/parallel_io.c
View file @
6fae7e8e
...
...
@@ -487,8 +487,9 @@ void read_ic_parallel(char* fileName, const struct UnitSystem* internal_units,
}
/* Convert the dimensions of the box */
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
/* Allocate memory to store SPH particles */
*
Ngas
=
N
[
0
];
...
...
src/serial_io.c
View file @
6fae7e8e
...
...
@@ -529,8 +529,9 @@ void read_ic_serial(char* fileName, const struct UnitSystem* internal_units,
}
/* Convert the dimensions of the box */
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
/* Now need to broadcast that information to all ranks. */
MPI_Bcast
(
flag_entropy
,
1
,
MPI_INT
,
0
,
comm
);
...
...
src/single_io.c
View file @
6fae7e8e
...
...
@@ -434,8 +434,9 @@ void read_ic_single(char* fileName, const struct UnitSystem* internal_units,
}
/* Convert the dimensions of the box */
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
for
(
int
j
=
0
;
j
<
3
;
j
++
)
dim
[
j
]
*=
units_conversion_factor
(
ic_units
,
internal_units
,
UNIT_CONV_LENGTH
);
/* Allocate memory to store SPH particles */
*
Ngas
=
N
[
0
];
...
...
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