Make LJ combination rule enum into an enum class

[alexxy/gromacs.git] / src / gromacs / nbnxm / kerneldispatch.cpp

diff --git a/src/gromacs/nbnxm/kerneldispatch.cpp b/src/gromacs/nbnxm/kerneldispatch.cpp
index 5b4c5d7906ef4f0e74d7366f843e8ce4277df0e2..c840addd4cacbec79a37ef2aa84eb5eb7699474e 100644 (file)
--- a/src/gromacs/nbnxm/kerneldispatch.cpp
+++ b/src/gromacs/nbnxm/kerneldispatch.cpp
@@ -2,7 +2,7 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team.
- * Copyright (c) 2017,2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018,2019,2020,2021, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -203,11 +203,11 @@ static void nbnxn_kernel_cpu(const PairlistSet&         pairlistSet,
         {
             case eintmodNONE:
             case eintmodPOTSHIFT:
-                switch (nbatParams.comb_rule)
+                switch (nbatParams.ljCombinationRule)
                 {
-                    case ljcrGEOM: vdwkt = vdwktLJCUT_COMBGEOM; break;
-                    case ljcrLB: vdwkt = vdwktLJCUT_COMBLB; break;
-                    case ljcrNONE: vdwkt = vdwktLJCUT_COMBNONE; break;
+                    case LJCombinationRule::Geometric: vdwkt = vdwktLJCUT_COMBGEOM; break;
+                    case LJCombinationRule::LorentzBerthelot: vdwkt = vdwktLJCUT_COMBLB; break;
+                    case LJCombinationRule::None: vdwkt = vdwktLJCUT_COMBNONE; break;
                     default: GMX_RELEASE_ASSERT(false, "Unknown combination rule");
                 }
                 break;