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
Volker Springel
Gadget4
Commits
bf109c4e
Commit
bf109c4e
authored
Jul 04, 2021
by
Volker Springel
Browse files
fix compilation problem if MERGERTREE is used together with GADGET2_HEADER
parent
8ee7f358
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/io/snap_io.cc
View file @
bf109c4e
...
...
@@ -689,7 +689,7 @@ void snap_io::fill_file_header(int writeTask, int lastTask, long long *n_type, l
header
.
npartTotal
[
n
]
=
ntot_type_all
[
n
];
}
#ifdef
MERGERTREE
#if
def
ined(
MERGERTREE
) && !defined(GADGET2_HEADER)
if
(
snap_type
==
MOST_BOUND_PARTICLE_SNAPHOT_REORDERED
)
{
header
.
Ntrees
=
ntot_type
[
NTYPES
];
...
...
@@ -854,7 +854,7 @@ void snap_io::read_file_header(const char *fname, int filenr, int readTask, int
nall
+=
n_for_this_task
;
}
#ifdef
MERGERTREE
#if
def
ined(
MERGERTREE
) && !defined(GADGET2_HEADER)
if
(
snap_type
==
MOST_BOUND_PARTICLE_SNAPHOT_REORDERED
)
ntot_type
[
NTYPES
]
=
header
.
Ntrees
;
#endif
...
...
@@ -940,7 +940,7 @@ void snap_io::read_header_fields(const char *fname)
read_vector_attribute
(
handle
,
"NumPart_Total"
,
header
.
npartTotal
,
H5T_NATIVE_UINT64
,
ntypes
);
#ifdef
MERGERTREE
#if
def
ined(
MERGERTREE
) && !defined(GADGET2_HEADER)
if
(
snap_type
==
MOST_BOUND_PARTICLE_SNAPHOT_REORDERED
)
{
read_scalar_attribute
(
handle
,
"Ntrees_ThisFile"
,
&
header
.
Ntrees
,
H5T_NATIVE_UINT64
);
...
...
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