Merge pull request espressomd#2520 from fweik/tab

core: Make tabulated pair IA not crash if distance is too small
RudolfWeeber · Mar 12, 2019 · a1a7e04 · a1a7e04
1 parent fa859b3
commit a1a7e04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/core/TabulatedPotential.hpp b/src/core/TabulatedPotential.hpp
@@ -22,6 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "utils/linear_interpolation.hpp"
 #include "utils/serialization/List.hpp"
 
+#include <boost/algorithm/clamp.hpp>
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/vector.hpp>
 
@@ -36,13 +37,15 @@ struct TabulatedPotential {
   std::vector<double> energy_tab;
 
   double force(double x) const {
-    assert(x <= maxval);
-    return Utils::linear_interpolation(force_tab, invstepsize, minval, x);
+    using boost::algorithm::clamp;
+    return Utils::linear_interpolation(force_tab, invstepsize, minval,
+                                       clamp(x, minval, maxval));
   }
 
   double energy(double x) const {
-    assert(x <= maxval);
-    return Utils::linear_interpolation(energy_tab, invstepsize, minval, x);
+    using boost::algorithm::clamp;
+    return Utils::linear_interpolation(energy_tab, invstepsize, minval,
+                                       clamp(x, minval, maxval));
   }
 
   double cutoff() const { return maxval; }

diff --git a/src/core/utils/linear_interpolation.hpp b/src/core/utils/linear_interpolation.hpp
@@ -27,6 +27,7 @@ T linear_interpolation(Container const &table, T hi, T offset, T x) {
   auto const dind = (x - offset) * hi;
   auto const ind = static_cast<int>(dind);
   assert(ind <= dind);
+  assert((ind >= 0) and (ind < table.size()));
   auto const dx = dind - ind;
 
   /* linear interpolation between data points */