Use constexpr for physical constants and move them into gmx namespace

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / x2top.cpp

diff --git a/src/gromacs/gmxpreprocess/x2top.cpp b/src/gromacs/gmxpreprocess/x2top.cpp
index b439d0ca456738278e4bde39f6cb6ff3c7becd79..876afdef94c6241d2b86adc6b32d52b9d1dac2ae 100644 (file)
--- a/src/gromacs/gmxpreprocess/x2top.cpp
+++ b/src/gromacs/gmxpreprocess/x2top.cpp
@@ -270,7 +270,7 @@ static void calc_angles_dihs(InteractionsOfType* ang, InteractionsOfType* dih, c
         int  ai = angle.ai();
         int  aj = angle.aj();
         int  ak = angle.ak();
-        real th = RAD2DEG
+        real th = gmx::c_rad2Deg
                   * bond_angle(x[ai], x[aj], x[ak], bPBC ? &pbc : nullptr, r_ij, r_kj, &costh, &t1, &t2);
         angle.setForceParameter(0, th);
     }
@@ -281,7 +281,7 @@ static void calc_angles_dihs(InteractionsOfType* ang, InteractionsOfType* dih, c
         int  ak = dihedral.ak();
         int  al = dihedral.al();
         real ph =
-                RAD2DEG
+                gmx::c_rad2Deg
                 * dih_angle(x[ai], x[aj], x[ak], x[al], bPBC ? &pbc : nullptr, r_ij, r_kj, r_kl, m, n, &t1, &t2, &t3);
         dihedral.setForceParameter(0, ph);
     }