Make non bonded energy terms enum class

[alexxy/gromacs.git] / src / gromacs / mdlib / energyoutput.h

diff --git a/src/gromacs/mdlib/energyoutput.h b/src/gromacs/mdlib/energyoutput.h
index 8322e2dc1d1c5dd24b4c72cdaeaca35f52dd1817..f8071be93fb51b25512a15ec5cb9438fd756e9ab 100644 (file)
--- a/src/gromacs/mdlib/energyoutput.h
+++ b/src/gromacs/mdlib/energyoutput.h
@@ -78,7 +78,7 @@ enum class StartingBehavior;
 } // namespace gmx
 
 //! \brief Printed names for intergroup energies
-extern const char* egrp_nm[egNR + 1];
+const char* enumValueToString(NonBondedEnergyTerms enumValue);
 
 /* \brief delta_h block type enum: the kinds of energies written out. */
 enum
@@ -375,8 +375,8 @@ private:
     //! Index for viscocity
     int ivisc_ = 0;
 
-    //! Which energy terms from egNR list should be printed in group-to-group block
-    bool bEInd_[egNR] = { false };
+    //! Which energy terms from NonBondedEnergyTerms list should be printed in group-to-group block
+    gmx::EnumerationArray<NonBondedEnergyTerms, bool> bEInd_;
     //! Number of energy terms to be printed (these, for which bEInd[] == true)
     int nEc_ = 0;
     //! Number of energy output groups