From 48a871be97989c3ace82469cf1879bd40dbf6057 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Wed, 14 Nov 2018 17:34:34 +0100
Subject: [PATCH] Removed 'unused' attribute, which does not work on windows
---
boundaries/boundaryhandling.py | 2 +-
geometry.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/boundaries/boundaryhandling.py b/boundaries/boundaryhandling.py
index 4f2a0c61..fb9225df 100644
--- a/boundaries/boundaryhandling.py
+++ b/boundaries/boundaryhandling.py
@@ -91,7 +91,7 @@ class LbmWeightInfo(CustomCppCode):
def __init__(self, lb_method):
weights = [str(w.evalf()) for w in lb_method.weights]
w_sym = LbmWeightInfo.WEIGHTS_SYMBOL
- code = "const double __attribute__((unused)) %s [] = { %s };\n" % (w_sym.name, ",".join(weights))
+ code = "const double %s [] = { %s };\n" % (w_sym.name, ",".join(weights))
super(LbmWeightInfo, self).__init__(code, symbols_read=set(), symbols_defined={w_sym})
diff --git a/geometry.py b/geometry.py
index 80ae2497..e0cec5ae 100644
--- a/geometry.py
+++ b/geometry.py
@@ -253,7 +253,7 @@ def add_black_and_white_image(boundary_handling, image_file, target_slice=None,
image_target_slice = shift_slice(intersection_slice, [-s.start for s in image_slice])
mask_target_slice = [mask_target_slice[i] if i in plane else slice(None, None) for i in range(dim)]
image_target_slice = [image_target_slice[i] if i in plane else np.newaxis for i in range(dim)]
- result[tuple(mask_target_slice)] = zoomed_image[image_target_slice]
+ result[tuple(mask_target_slice)] = zoomed_image[tuple(image_target_slice)]
return result
return boundary_handling.set_boundary(boundary, slice_obj=image_slice, mask_callback=callback,
--
GitLab