Merge release-2018 into master

[alexxy/gromacs.git] / src / gromacs / awh / biasstate.cpp

diff --git a/src/gromacs/awh/biasstate.cpp b/src/gromacs/awh/biasstate.cpp
index 64394f9a883ac543ae4ff83135a22cc31d9c5e81..9cd6a2ec8a5cb6b975962bc4e2b5dfae371052f7 100644 (file)
--- a/src/gromacs/awh/biasstate.cpp
+++ b/src/gromacs/awh/biasstate.cpp
@@ -1066,7 +1066,7 @@ void BiasState::updateFreeEnergyAndAddSamplesToHistogram(const std::vector<DimPa
     bool detectedCovering = false;
     if (inInitialStage())
     {
-        detectedCovering = (params.isCheckStep(points_.size(), step) &&
+        detectedCovering = (params.isCheckCoveringStep(step) &&
                             isSamplingRegionCovered(params, dimParams, grid,
                                                     commRecord, multiSimComm));
     }
@@ -1584,7 +1584,7 @@ static void readUserPmfAndTargetDistribution(const std::vector<DimParams> &dimPa
     if (targetDistributionIsZero)
     {
         std::string mesg = gmx::formatString("The target weights given in column %d in %s are all 0",
-                                             filename.c_str(), columnIndexTarget);
+                                             columnIndexTarget, filename.c_str());
         GMX_THROW(InvalidInputError(mesg));
     }