From cabbaecc6b48a91376643576d34c53754a76aa29 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 8 Sep 2017 23:04:42 +0200
Subject: [PATCH] Code formatting and removed memory leak on exit.
---
src/engine.c | 4 ++--
src/vector.h | 6 ++++--
src/xmf.c | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 8f2ce85a97..c6fcf2099b 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4762,14 +4762,14 @@ void engine_compute_next_snapshot_time(struct engine *e) {
*/
void engine_clean(struct engine *e) {
-#ifdef WITH_VECTORIZATION
for (int i = 0; i < e->nr_threads; ++i) {
+#ifdef WITH_VECTORIZATION
cache_clean(&e->runners[i].ci_cache);
cache_clean(&e->runners[i].cj_cache);
+#endif
gravity_cache_clean(&e->runners[i].ci_gravity_cache);
gravity_cache_clean(&e->runners[i].cj_gravity_cache);
}
-#endif
free(e->runners);
free(e->snapshotUnits);
free(e->links);
diff --git a/src/vector.h b/src/vector.h
index 70dbd16710..e463bbd2e6 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -91,7 +91,8 @@
#define vec_init_mask_true(mask) ({ mask = 0xFFFF; })
#define vec_zero_mask(mask) ({ mask = 0; })
#define vec_create_mask(mask, cond) ({ mask = cond; })
-#define vec_combine_masks(mask1, mask2) ({ mask1 = vec_mask_and(mask1,mask2); })
+#define vec_combine_masks(mask1, mask2) \
+ ({ mask1 = vec_mask_and(mask1, mask2); })
#define vec_pad_mask(mask, pad) ({ mask = mask >> (pad); })
#define vec_blend(mask, a, b) _mm512_mask_blend_ps(mask, a, b)
#define vec_todbl_lo(a) _mm512_cvtps_pd(_mm512_extract128_ps(a, 0))
@@ -187,7 +188,8 @@
#define vec_and_mask(a, mask) _mm256_and_ps(a, mask.v)
#define vec_init_mask_true(mask) mask.m = vec_setint1(0xFFFFFFFF)
#define vec_create_mask(mask, cond) mask.v = cond
-#define vec_combine_masks(mask1, mask2) ({ mask1.v = vec_mask_and(mask1,mask2); })
+#define vec_combine_masks(mask1, mask2) \
+ ({ mask1.v = vec_mask_and(mask1, mask2); })
#define vec_zero_mask(mask) mask.v = vec_setzero()
#define vec_pad_mask(mask, pad) \
for (int i = VEC_SIZE - (pad); i < VEC_SIZE; i++) mask.i[i] = 0
diff --git a/src/xmf.c b/src/xmf.c
index 67682b4794..3c8bb257cc 100644
--- a/src/xmf.c
+++ b/src/xmf.c
@@ -205,6 +205,7 @@ void xmf_write_groupfooter(FILE* xmfFile, enum part_type ptype) {
*/
int xmf_precision(enum IO_DATA_TYPE type) {
switch (type) {
+ case INT:
case FLOAT:
return 4;
break;
@@ -233,6 +234,7 @@ const char* xmf_type(enum IO_DATA_TYPE type) {
case DOUBLE:
return "Float";
break;
+ case INT:
case ULONGLONG:
case LONGLONG:
return "Int";
--
GitLab