Merge release-2019 into master

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

diff --git a/src/gromacs/awh/awh.cpp b/src/gromacs/awh/awh.cpp
index 00b1f87072640640341ee345d627b146b11d663b..3d035c3ff8ad6eab3ed8f9bfef30e72b79b43093 100644 (file)
--- a/src/gromacs/awh/awh.cpp
+++ b/src/gromacs/awh/awh.cpp
@@ -57,12 +57,13 @@
 #include "gromacs/fileio/enxio.h"
 #include "gromacs/gmxlib/network.h"
 #include "gromacs/math/units.h"
-#include "gromacs/mdtypes/awh-history.h"
-#include "gromacs/mdtypes/awh-params.h"
+#include "gromacs/mdrunutility/multisim.h"
+#include "gromacs/mdtypes/awh_history.h"
+#include "gromacs/mdtypes/awh_params.h"
 #include "gromacs/mdtypes/commrec.h"
 #include "gromacs/mdtypes/forceoutput.h"
 #include "gromacs/mdtypes/inputrec.h"
-#include "gromacs/mdtypes/pull-params.h"
+#include "gromacs/mdtypes/pull_params.h"
 #include "gromacs/mdtypes/state.h"
 #include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pulling/pull.h"
@@ -422,8 +423,8 @@ prepareAwhModule(FILE                 *fplog,
         GMX_THROW(InvalidInputError("AWH biasing does not support shell particles."));
     }
 
-    auto awh = compat::make_unique<Awh>(fplog, inputRecord, commRecord, multiSimRecord, *inputRecord.awhParams,
-                                        biasInitFilename, pull_work);
+    auto awh = std::make_unique<Awh>(fplog, inputRecord, commRecord, multiSimRecord, *inputRecord.awhParams,
+                                     biasInitFilename, pull_work);
 
     if (startingFromCheckpoint)
     {