Skip to content
GitLab
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
f012c4bc
Commit
f012c4bc
authored
May 16, 2013
by
Pedro Gonnet
Browse files
forgot about empty cells, no super.
Former-commit-id: 6ea4f886f11c84f67197cc58a3b137f02be967f8
parent
5366dfb9
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/engine.c
View file @
f012c4bc
...
...
@@ -320,7 +320,7 @@ void engine_collect_kick2 ( struct cell *c ) {
struct
cell
*
cp
;
/* If I am a super-cell, return immediately. */
if
(
c
->
kick2
!=
NULL
)
if
(
c
->
kick2
!=
NULL
||
c
->
count
==
0
)
return
;
/* If this cell is not split, I'm in trouble. */
...
...
src/io.c
View file @
f012c4bc
...
...
@@ -271,7 +271,7 @@ void readArrayBackEnd(hid_t grp, char* name, enum DATA_TYPE type, int N, int dim
void
read_ic
(
char
*
fileName
,
double
dim
[
3
],
struct
part
**
parts
,
int
*
N
,
int
*
periodic
)
{
hid_t
h_file
=
0
,
h_grp
=
0
;
double
boxSize
[
3
]
=
{
0
.,
-
1
,
-
1
};
/* GADGET has only cubic boxes (in cosmological mode) */
double
boxSize
[
3
]
=
{
0
.
0
,
-
1
.
0
,
-
1
.
0
};
/* GADGET has only cubic boxes (in cosmological mode) */
int
numParticles
[
6
]
=
{
0
};
/* GADGET has 6 particle types. We only keep the type 0*/
/* Open file */
...
...
@@ -308,10 +308,8 @@ void read_ic ( char* fileName, double dim[3], struct part **parts, int* N, int*
*
N
=
numParticles
[
0
];
dim
[
0
]
=
boxSize
[
0
];
if
(
boxSize
[
1
]
<
0
)
dim
[
1
]
=
boxSize
[
0
];
if
(
boxSize
[
2
]
<
0
)
dim
[
2
]
=
boxSize
[
0
];
dim
[
1
]
=
(
boxSize
[
1
]
<
0
)
?
boxSize
[
0
]
:
boxSize
[
1
];
dim
[
2
]
=
(
boxSize
[
2
]
<
0
)
?
boxSize
[
0
]
:
boxSize
[
2
];
/* printf("read_ic: Found %d particles in a %speriodic box of size [%f %f %f]\n", */
/* *N, (periodic ? "": "non-"), dim[0], dim[1], dim[2]); */
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment