Merge pull request #2337 from KaiSzuttor/non_bonded_test

Features: LJGEN_SOFTCORE implies LENNARD_JONES_GENERIC.
espressomd · Oct 26, 2018 · 6944131 · 6944131
2 parents b49cdf6 + 539d18f
commit 6944131
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/features.def b/src/features.def
@@ -90,7 +90,7 @@ LJ_WARN_WHEN_CLOSE
 LENNARD_JONES_GENERIC           implies LENNARD_JONES
 LJCOS
 LJCOS2
-LJGEN_SOFTCORE
+LJGEN_SOFTCORE                  implies LENNARD_JONES_GENERIC
 COS2
 GAY_BERNE
 SMOOTH_STEP