gmxana: clean up -Wunused-parameter warnings

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_wham.cpp

diff --git a/src/gromacs/gmxana/gmx_wham.cpp b/src/gromacs/gmxana/gmx_wham.cpp
index 7fb0ec3b1ec41bbe03ba1d71b3af2539928c057b..238de2b23078b7156734285e79a90ec33f3af402 100644 (file)
--- a/src/gromacs/gmxana/gmx_wham.cpp
+++ b/src/gromacs/gmxana/gmx_wham.cpp
@@ -2528,8 +2528,7 @@ void read_tpr_pullxf_files(char **fnTprs, char **fnPull, int nfiles,
  * Note: Here we consider tau[int] := int_0^inf ACF(t) as the integrated autocorrelation times.
  * The factor `g := 1 + 2*tau[int]` subsequently enters the uncertainty.
  */
-void readIntegratedAutocorrelationTimes(t_UmbrellaWindow *window, int nwins, t_UmbrellaOptions *opt,
-                                        const char* fn)
+void readIntegratedAutocorrelationTimes(t_UmbrellaWindow *window, int nwins, const char* fn)
 {
     int      nlines, ny, i, ig;
     double **iact;
@@ -2787,7 +2786,7 @@ void calcIntegratedAutocorrelationTimes(t_UmbrellaWindow *window, int nwins,
 /*! \brief
  * compute average and sigma of each umbrella histogram
  */
-void averageSigma(t_UmbrellaWindow *window, int nwins, t_UmbrellaOptions *opt)
+void averageSigma(t_UmbrellaWindow *window, int nwins)
 {
     int  i, ig, ntot, k;
     real av, sum2, sig, diff, *ztime, nSamplesIndep;
@@ -2942,8 +2941,7 @@ void  checkReactionCoordinateCovered(t_UmbrellaWindow *window, int nwins,
  *
  * This speeds up the convergence by roughly a factor of 2
  */
-void guessPotByIntegration(t_UmbrellaWindow *window, int nWindows, t_UmbrellaOptions *opt,
-                           char *fn)
+void guessPotByIntegration(t_UmbrellaWindow *window, int nWindows, t_UmbrellaOptions *opt)
 {
     int    i, j, ig, bins = opt->bins, nHist, winmin, groupmin;
     double dz, min = opt->min, *pot, pos, hispos, dist, diff, fAv, distmin, *f;
@@ -3552,7 +3550,7 @@ int gmx_wham(int argc, char *argv[])
     /* Integrated autocorrelation times provided ? */
     if (opt.bTauIntGiven)
     {
-        readIntegratedAutocorrelationTimes(window, nwins, &opt, opt2fn("-iiact", NFILE, fnm));
+        readIntegratedAutocorrelationTimes(window, nwins, opt2fn("-iiact", NFILE, fnm));
     }
 
     /* Compute integrated autocorrelation times */
@@ -3565,13 +3563,13 @@ int gmx_wham(int argc, char *argv[])
        (maybe required for bootstrapping. If not, this is fast anyhow) */
     if (opt.nBootStrap && opt.bsMethod == bsMethod_trajGauss)
     {
-        averageSigma(window, nwins, &opt);
+        averageSigma(window, nwins);
     }
 
     /* Get initial potential by simple integration */
     if (opt.bInitPotByIntegration)
     {
-        guessPotByIntegration(window, nwins, &opt, 0);
+        guessPotByIntegration(window, nwins, &opt);
     }
 
     /* Check if complete reaction coordinate is covered */