Skip to content
Snippets Groups Projects
Commit 61d43697 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Only support GADGET-SPH in the logger for now.

parent 257adafe
No related branches found
No related tags found
No related merge requests found
...@@ -134,13 +134,11 @@ void logger_log_part(struct part *p, unsigned int mask, size_t *offset, ...@@ -134,13 +134,11 @@ void logger_log_part(struct part *p, unsigned int mask, size_t *offset,
buff += 3 * sizeof(float); buff += 3 * sizeof(float);
} }
#if defined(GADGET2_SPH)
/* Particle internal energy as a single float. */ /* Particle internal energy as a single float. */
if (mask & logger_mask_u) { if (mask & logger_mask_u) {
#if defined(GADGET2_SPH)
memcpy(buff, &p->entropy, sizeof(float)); memcpy(buff, &p->entropy, sizeof(float));
#else
memcpy(buff, &p->u, sizeof(float));
#endif
buff += sizeof(float); buff += sizeof(float);
} }
...@@ -164,6 +162,8 @@ void logger_log_part(struct part *p, unsigned int mask, size_t *offset, ...@@ -164,6 +162,8 @@ void logger_log_part(struct part *p, unsigned int mask, size_t *offset,
buff += sizeof(long long); buff += sizeof(long long);
} }
#endif
/* Update the log message offset. */ /* Update the log message offset. */
*offset = offset_new; *offset = offset_new;
} }
...@@ -305,13 +305,11 @@ int logger_read_part(struct part *p, size_t *offset, const char *buff) { ...@@ -305,13 +305,11 @@ int logger_read_part(struct part *p, size_t *offset, const char *buff) {
buff += 3 * sizeof(float); buff += 3 * sizeof(float);
} }
#if defined(GADGET2_SPH)
/* Particle internal energy as a single float. */ /* Particle internal energy as a single float. */
if (mask & logger_mask_u) { if (mask & logger_mask_u) {
#if defined(GADGET2_SPH)
memcpy(&p->entropy, buff, sizeof(float)); memcpy(&p->entropy, buff, sizeof(float));
#else
memcpy(&p->u, buff, sizeof(float));
#endif
buff += sizeof(float); buff += sizeof(float);
} }
...@@ -335,6 +333,8 @@ int logger_read_part(struct part *p, size_t *offset, const char *buff) { ...@@ -335,6 +333,8 @@ int logger_read_part(struct part *p, size_t *offset, const char *buff) {
buff += sizeof(long long); buff += sizeof(long long);
} }
#endif
/* Finally, return the mask of the values we just read. */ /* Finally, return the mask of the values we just read. */
return mask; return mask;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment