Add trivial const qualifiers to shellfc and EnergyOutput

Change-Id: I2ce3ef7c777aa6f7b93706553c44545fc5962b4f

diff --git a/src/gromacs/mdlib/energyoutput.cpp b/src/gromacs/mdlib/energyoutput.cpp
index 6628445044847125f8d61b64613c427242c241da..5253f3b010e2e1aad4d4334cc2db3874f2719f9c 100644 (file)
--- a/src/gromacs/mdlib/energyoutput.cpp
+++ b/src/gromacs/mdlib/energyoutput.cpp
@@ -900,17 +900,17 @@ void EnergyOutput::addDataAtEnergyStep(bool                    bDoDHDL,
                                        bool                    bSum,
                                        double                  time,
                                        real                    tmass,
-                                       gmx_enerdata_t         *enerd,
-                                       t_state                *state,
-                                       t_lambda               *fep,
-                                       t_expanded             *expand,
-                                       matrix                  box,
-                                       tensor                  svir,
-                                       tensor                  fvir,
-                                       tensor                  vir,
-                                       tensor                  pres,
-                                       gmx_ekindata_t         *ekind,
-                                       rvec                    mu_tot,
+                                       const gmx_enerdata_t   *enerd,
+                                       const t_state          *state,
+                                       const t_lambda         *fep,
+                                       const t_expanded       *expand,
+                                       const matrix            box,
+                                       const tensor            svir,
+                                       const tensor            fvir,
+                                       const tensor            vir,
+                                       const tensor            pres,
+                                       const gmx_ekindata_t   *ekind,
+                                       const rvec              mu_tot,
                                        const gmx::Constraints *constr)
 {
     int    j, k, kk, n, gid;

diff --git a/src/gromacs/mdlib/energyoutput.h b/src/gromacs/mdlib/energyoutput.h
index 4ecba82ce3f10cedf7d9102a5c44541555891615..1964feddc9884eab3db8015e191a206c7572c9f0 100644 (file)
--- a/src/gromacs/mdlib/energyoutput.h
+++ b/src/gromacs/mdlib/energyoutput.h
@@ -155,17 +155,17 @@ class EnergyOutput
                                  bool                    bSum,
                                  double                  time,
                                  real                    tmass,
-                                 gmx_enerdata_t         *enerd,
-                                 t_state                *state,
-                                 t_lambda               *fep,
-                                 t_expanded             *expand,
-                                 matrix                  lastbox,
-                                 tensor                  svir,
-                                 tensor                  fvir,
-                                 tensor                  vir,
-                                 tensor                  pres,
-                                 gmx_ekindata_t         *ekind,
-                                 rvec                    mu_tot,
+                                 const gmx_enerdata_t   *enerd,
+                                 const t_state          *state,
+                                 const t_lambda         *fep,
+                                 const t_expanded       *expand,
+                                 const matrix            lastbox,
+                                 const tensor            svir,
+                                 const tensor            fvir,
+                                 const tensor            vir,
+                                 const tensor            pres,
+                                 const gmx_ekindata_t   *ekind,
+                                 const rvec              mu_tot,
                                  const gmx::Constraints *constr);
 
         /*! \brief Update the data averaging structure counts.

diff --git a/src/gromacs/mdrun/shellfc.cpp b/src/gromacs/mdrun/shellfc.cpp
index bf966e57161072871b2b58b94927b5d721f7fce5..99fea9b83c618dad43b15e2c52fceadeb37f0e5c 100644 (file)
--- a/src/gromacs/mdrun/shellfc.cpp
+++ b/src/gromacs/mdrun/shellfc.cpp
@@ -893,7 +893,7 @@ static void init_adir(gmx_shellfc_t            *shfc,
                       rvec                     *x,
                       rvec                     *f,
                       rvec                     *acc_dir,
-                      matrix                    box,
+                      const matrix              box,
                       gmx::ArrayRef<const real> lambda,
                       real                     *dvdlambda)
 {
@@ -987,7 +987,7 @@ void relax_shell_flexcon(FILE                                     *fplog,
                          int                                       natoms,
                          gmx::ArrayRefWithPadding<gmx::RVec>       x,
                          gmx::ArrayRefWithPadding<gmx::RVec>       v,
-                         matrix                                    box,
+                         const matrix                              box,
                          gmx::ArrayRef<real>                       lambda,
                          history_t                                *hist,
                          gmx::ArrayRefWithPadding<gmx::RVec>       f,

diff --git a/src/gromacs/mdrun/shellfc.h b/src/gromacs/mdrun/shellfc.h
index cfb4516ff816ab7da01a9c20a9e5befdaf61bceb..778288566962bf5ef83e9103213de919857458dc 100644 (file)
--- a/src/gromacs/mdrun/shellfc.h
+++ b/src/gromacs/mdrun/shellfc.h
@@ -91,7 +91,7 @@ void relax_shell_flexcon(FILE                                     *log,
                          int                                       natoms,
                          gmx::ArrayRefWithPadding<gmx::RVec>       x,
                          gmx::ArrayRefWithPadding<gmx::RVec>       v,
-                         matrix                                    box,
+                         const matrix                              box,
                          gmx::ArrayRef<real>                       lambda,
                          history_t                                *hist,
                          gmx::ArrayRefWithPadding<gmx::RVec>       f,