From 4bb6cb65fd56b2af3cd3871b63dde34e558bace92a331c95ed6c585353531afd Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 4 May 2023 12:54:58 +0000 Subject: [PATCH] Accepting request 1084332 from home:jngrad:branches:devel:languages:python:numeric Fix LB inertialess tracers bug, fix compiler warnings OBS-URL: https://build.opensuse.org/request/show/1084332 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=47 --- array-bounds.patch | 19 +++++++++++++++++++ python3-espressomd.changes | 7 +++++++ python3-espressomd.spec | 4 ++++ tracers.patch | 13 +++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 array-bounds.patch create mode 100644 tracers.patch diff --git a/array-bounds.patch b/array-bounds.patch new file mode 100644 index 0000000..ae7c696 --- /dev/null +++ b/array-bounds.patch @@ -0,0 +1,19 @@ +diff --git a/src/core/p3m/interpolation.hpp b/src/core/p3m/interpolation.hpp +index a25b0d8f66..0573648938 100644 +--- a/src/core/p3m/interpolation.hpp ++++ b/src/core/p3m/interpolation.hpp +@@ -109,10 +109,10 @@ class p3m_interpolation_cache { + InterpolationWeights ret; + ret.ind = ca_fmp[i]; + +- auto const offset = ca_frac.data() + 3 * i * m_cao; +- boost::copy(make_const_span(offset + 0 * m_cao, m_cao), ret.w_x.begin()); +- boost::copy(make_const_span(offset + 1 * m_cao, m_cao), ret.w_y.begin()); +- boost::copy(make_const_span(offset + 2 * m_cao, m_cao), ret.w_z.begin()); ++ auto const offset = ca_frac.data() + 3 * i * cao; ++ boost::copy(make_const_span(offset + 0 * cao, cao), ret.w_x.begin()); ++ boost::copy(make_const_span(offset + 1 * cao, cao), ret.w_y.begin()); ++ boost::copy(make_const_span(offset + 2 * cao, cao), ret.w_z.begin()); + + return ret; + } diff --git a/python3-espressomd.changes b/python3-espressomd.changes index d615ff9..d7d0076 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 26 18:06:17 UTC 2023 - Jean-Noel Grad + +- Fix LB inertialess tracers bug, fix compiler warnings +- Add tracers.patch to fix LB inertialess tracers (gh#espressomd/espresso#4714) +- Add array-bounds.patch to fix compiler warnings (gh#espressomd/espresso#4715) + ------------------------------------------------------------------- Tue Apr 18 10:43:03 UTC 2023 - Jean-Noel Grad diff --git a/python3-espressomd.spec b/python3-espressomd.spec index 8b3bbe2..c73763c 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -44,6 +44,10 @@ URL: http://espressomd.org Source: https://github.com/%{modname}/%{pkgname}/releases/download/%{version}/%{pkgname}-%{version}.tar.gz # PATCH-FIX-UPSTREAM setuptools.patch gh#espressomd/espresso#4709 Patch0: setuptools.patch +# PATCH-FIX-UPSTREAM tracers.patch gh#espressomd/espresso#4714 +Patch1: tracers.patch +# PATCH-FIX-UPSTREAM array-bounds.patch gh#espressomd/espresso#4715 +Patch2: array-bounds.patch # According to gh#espressomd/espresso#4537 32bit architectures are not supported any more ExcludeArch: %{ix86} BuildRequires: cmake diff --git a/tracers.patch b/tracers.patch new file mode 100644 index 0000000..93b98d7 --- /dev/null +++ b/tracers.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/virtual_sites/lb_inertialess_tracers.cpp b/src/core/virtual_sites/lb_inertialess_tracers.cpp +index 5aae5af66c..b87b2d4232 100644 +--- a/src/core/virtual_sites/lb_inertialess_tracers.cpp ++++ b/src/core/virtual_sites/lb_inertialess_tracers.cpp +@@ -92,7 +92,7 @@ void IBM_UpdateParticlePositions(ParticleRange const &particles, + // Euler integrator + for (auto &p : particles) { + if (p.is_virtual()) { +- for (int axis = 0; axis < 2; axis++) { ++ for (int axis = 0; axis < 3; axis++) { + #ifdef EXTERNAL_FORCES + if (not p.is_fixed_along(axis)) + #endif