Remove preprocessor usage for atomInfo

[alexxy/gromacs.git] / src / gromacs / mdrun / tpi.cpp

diff --git a/src/gromacs/mdrun/tpi.cpp b/src/gromacs/mdrun/tpi.cpp
index 606ab186efc92516c7a36d9baa6c8728b365d1f9..e84fdff31afa0d373c77084d43451c019d1659cd 100644 (file)
--- a/src/gromacs/mdrun/tpi.cpp
+++ b/src/gromacs/mdrun/tpi.cpp
@@ -444,10 +444,10 @@ void LegacySimulator::do_tpi()
     fr->nbv->changePairlistRadii(inputrec->rlist, inputrec->rlist);
 
     ngid   = groups->groups[SimulationAtomGroupType::EnergyOutput].size();
-    gid_tp = GET_CGINFO_GID(fr->atomInfo[a_tp0]);
+    gid_tp = fr->atomInfo[a_tp0] & gmx::sc_atomInfo_EnergyGroupIdMask;
     for (int a = a_tp0 + 1; a < a_tp1; a++)
     {
-        if (GET_CGINFO_GID(fr->atomInfo[a]) != gid_tp)
+        if ((fr->atomInfo[a] & gmx::sc_atomInfo_EnergyGroupIdMask) != gid_tp)
         {
             fprintf(fplog,
                     "NOTE: Atoms in the molecule to insert belong to different energy groups.\n"