Compilation fixes in gmx_density.c and histogram.cpp

diff --git a/src/gromacs/analysisdata/modules/histogram.cpp b/src/gromacs/analysisdata/modules/histogram.cpp
index f760527dcfb7764654e797c39c5f893fbbc27d45..b7732c9c1a832dbfee905a9b82ef2ae9a4a76b15 100644 (file)
--- a/src/gromacs/analysisdata/modules/histogram.cpp
+++ b/src/gromacs/analysisdata/modules/histogram.cpp
@@ -94,7 +94,7 @@ AbstractHistogramModule::initRange(real miny, real maxy, real binw,
     assert(miny < maxy && binw > 0);
     if (bIntegerBins)
     {
-        _nbins = ceil((maxy - miny) / binw) + 1;
+        _nbins = (int)ceil((maxy - miny) / binw) + 1;
         miny -= 0.5 * binw;
         maxy  = miny + _nbins * binw;
     }
@@ -481,7 +481,7 @@ AnalysisDataBinAverageModule::frameStarted(real x, real dx)
 {
     for (int i = 0; i < nbins(); ++i)
     {
-        _n[i] = 0.0;
+        _n[i] = 0;
     }
     return AbstractHistogramModule::frameStarted(x, dx);
 }

diff --git a/src/tools/gmx_density.c b/src/tools/gmx_density.c
index ee4966daad3c69e9d78b9134650d4c3e3202345f..250e598c059f6acdc51daac20a05b38402890a74 100644 (file)
--- a/src/tools/gmx_density.c
+++ b/src/tools/gmx_density.c
@@ -323,7 +323,7 @@ void calc_density(const char *fn, atom_id **index, int gnx[],
   sfree(x0);  /* free memory used by coordinate array */
 }
 
-void plot_density(real *slDensity[], const char *afile, int nslices,
+void plot_density(double *slDensity[], const char *afile, int nslices,
                  int nr_grps, char *grpname[], real slWidth, 
                  const char **dens_opt,
                  gmx_bool bSymmetrize, const output_env_t oenv)