From 96ed445c729c48cf1f584a11aeab11e779222e95 Mon Sep 17 00:00:00 2001
From: "M. Eric Irrgang" <ericirrgang@gmail.com>
Date: Thu, 23 Apr 2020 17:37:02 +0300
Subject: [PATCH] Use ConstraintsParam.

Refs #3567
---
 src/gromacs/mdrun/runner.cpp           |  3 +--
 src/gromacs/mdrun/simulatorbuilder.cpp | 13 ++++++-------
 src/gromacs/mdrun/simulatorbuilder.h   | 14 ++++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/gromacs/mdrun/runner.cpp b/src/gromacs/mdrun/runner.cpp
index 36acc0d9ea..d310c92058 100644
--- a/src/gromacs/mdrun/runner.cpp
+++ b/src/gromacs/mdrun/runner.cpp
@@ -1656,8 +1656,7 @@ int Mdrunner::mdrunner()
 
         // build and run simulator object based on user-input
         auto simulator = simulatorBuilder.build(
-                useModularSimulator, static_cast<int>(filenames.size()), filenames.data(), vsite.get(),
-                constr.get(), enforcedRotation ? enforcedRotation->getLegacyEnfrot() : nullptr,
+                useModularSimulator, static_cast<int>(filenames.size()), filenames.data(),
                 deform.get(), mdModules_->outputProvider(), mdModules_->notifier(), inputrec,
                 imdSession.get(), pull_work, swap, &mtop, mdAtoms.get(), fr, replExParams);
         simulator->run();
diff --git a/src/gromacs/mdrun/simulatorbuilder.cpp b/src/gromacs/mdrun/simulatorbuilder.cpp
index 8aa55bff7b..5b53675b57 100644
--- a/src/gromacs/mdrun/simulatorbuilder.cpp
+++ b/src/gromacs/mdrun/simulatorbuilder.cpp
@@ -59,9 +59,6 @@ namespace gmx
 std::unique_ptr<ISimulator> SimulatorBuilder::build(bool                     useModularSimulator,
                                                     int                      nfile,
                                                     const t_filenm*          fnm,
-                                                    VirtualSitesHandler*     vsite,
-                                                    Constraints*             constr,
-                                                    gmx_enfrot*              enforcedRotation,
                                                     BoxDeformation*          deform,
                                                     IMDOutputProvider*       outputProvider,
                                                     const MdModulesNotifier& mdModulesNotifier,
@@ -140,7 +137,8 @@ std::unique_ptr<ISimulator> SimulatorBuilder::build(bool                     use
         return std::unique_ptr<ModularSimulator>(new ModularSimulator(
                 simulatorEnv_->fplog_, simulatorEnv_->commRec_, simulatorEnv_->multisimCommRec_,
                 simulatorEnv_->logger_, nfile, fnm, simulatorEnv_->outputEnv_, simulatorConfig_->mdrunOptions_,
-                simulatorConfig_->startingBehavior_, vsite, constr, enforcedRotation, deform,
+                simulatorConfig_->startingBehavior_, constraintsParam_->vsite,
+                constraintsParam_->constr, constraintsParam_->enforcedRotation, deform,
                 outputProvider, mdModulesNotifier, inputrec, imdSession, pull_work, swap, top_global,
                 simulatorStateData_->globalState_p, simulatorStateData_->observablesHistory_p,
                 mdAtoms, profiling_->nrnb, profiling_->wallCycle, fr, simulatorStateData_->enerdata_p,
@@ -151,9 +149,10 @@ std::unique_ptr<ISimulator> SimulatorBuilder::build(bool                     use
     // NOLINTNEXTLINE(modernize-make-unique): make_unique does not work with private constructor
     return std::unique_ptr<LegacySimulator>(new LegacySimulator(
             simulatorEnv_->fplog_, simulatorEnv_->commRec_, simulatorEnv_->multisimCommRec_,
-            simulatorEnv_->logger_, nfile, fnm, simulatorEnv_->outputEnv_, simulatorConfig_->mdrunOptions_,
-            simulatorConfig_->startingBehavior_, vsite, constr, enforcedRotation, deform,
-            outputProvider, mdModulesNotifier, inputrec, imdSession, pull_work, swap, top_global,
+            simulatorEnv_->logger_, nfile, fnm, simulatorEnv_->outputEnv_,
+            simulatorConfig_->mdrunOptions_, simulatorConfig_->startingBehavior_,
+            constraintsParam_->vsite, constraintsParam_->constr, constraintsParam_->enforcedRotation,
+            deform, outputProvider, mdModulesNotifier, inputrec, imdSession, pull_work, swap, top_global,
             simulatorStateData_->globalState_p, simulatorStateData_->observablesHistory_p, mdAtoms,
             profiling_->nrnb, profiling_->wallCycle, fr, simulatorStateData_->enerdata_p,
             simulatorStateData_->ekindata_p, simulatorConfig_->runScheduleWork_, replExParams,
diff --git a/src/gromacs/mdrun/simulatorbuilder.h b/src/gromacs/mdrun/simulatorbuilder.h
index 2dd0f41746..9088447fe4 100644
--- a/src/gromacs/mdrun/simulatorbuilder.h
+++ b/src/gromacs/mdrun/simulatorbuilder.h
@@ -165,11 +165,16 @@ public:
 class ConstraintsParam
 {
 public:
-    ConstraintsParam(Constraints gmx_unused* pConstraints,
-                     gmx_enfrot gmx_unused* pEnfrot,
-                     VirtualSitesHandler gmx_unused* pVsite)
+    ConstraintsParam(Constraints* constraints, gmx_enfrot* enforcedRotation, VirtualSitesHandler* vSite) :
+        constr(constraints),
+        enforcedRotation(enforcedRotation),
+        vsite(vSite)
     {
     }
+
+    Constraints*         constr;
+    gmx_enfrot*          enforcedRotation;
+    VirtualSitesHandler* vsite;
 };
 
 class LegacyInput
@@ -304,9 +309,6 @@ public:
     std::unique_ptr<ISimulator> build(bool                             useModularSimulator,
                                       int                              nfile,
                                       const t_filenm*                  fnm,
-                                      VirtualSitesHandler*             vsite,
-                                      Constraints*                     constr,
-                                      gmx_enfrot*                      enforcedRotation,
                                       BoxDeformation*                  deform,
                                       IMDOutputProvider*               outputProvider,
                                       const MdModulesNotifier&         mdModulesNotifier,
-- 
2.11.4.GIT