One argument per line for long function signatures.

Fixes #3833

diff --git a/.clang-format b/.clang-format
index 600e45a53206ca793f299f4de7d3c2710ca61528..b189deb7e2110a17bfdfe0b07106e523c7063710 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -17,7 +17,7 @@ AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
+BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
   AfterClass:      true

diff --git a/src/gromacs/mdrun/simulatorbuilder.cpp b/src/gromacs/mdrun/simulatorbuilder.cpp
index f1ed995d53f15bcc67a7af90d9f5243b4e95f99e..8a0e4edf1b6b946d841d7a388102b6950b6c51e0 100644 (file)
--- a/src/gromacs/mdrun/simulatorbuilder.cpp
+++ b/src/gromacs/mdrun/simulatorbuilder.cpp
@@ -128,39 +128,77 @@ std::unique_ptr<ISimulator> SimulatorBuilder::build(bool useModularSimulator)
     {
         // NOLINTNEXTLINE(modernize-make-unique): make_unique does not work with private constructor
         return std::unique_ptr<ModularSimulator>(new ModularSimulator(
-                std::make_unique<LegacySimulatorData>(
-                        simulatorEnv_->fplog_, simulatorEnv_->commRec_, simulatorEnv_->multisimCommRec_,
-                        simulatorEnv_->logger_, legacyInput_->numFile, legacyInput_->filenames,
-                        simulatorEnv_->outputEnv_, simulatorConfig_->mdrunOptions_,
-                        simulatorConfig_->startingBehavior_, constraintsParam_->vsite,
-                        constraintsParam_->constr, constraintsParam_->enforcedRotation,
-                        boxDeformation_->deform, simulatorModules_->outputProvider,
-                        simulatorModules_->mdModulesNotifier, legacyInput_->inputrec,
-                        interactiveMD_->imdSession, centerOfMassPulling_->pull_work, ionSwapping_->ionSwap,
-                        topologyData_->top_global, simulatorStateData_->globalState_p,
-                        simulatorStateData_->observablesHistory_p, topologyData_->mdAtoms,
-                        profiling_->nrnb, profiling_->wallCycle, legacyInput_->forceRec,
-                        simulatorStateData_->enerdata_p, simulatorStateData_->ekindata_p,
-                        simulatorConfig_->runScheduleWork_, *replicaExchangeParameters_,
-                        membedHolder_->membed(), profiling_->walltimeAccounting,
-                        std::move(stopHandlerBuilder_), simulatorConfig_->mdrunOptions_.rerun),
+                std::make_unique<LegacySimulatorData>(simulatorEnv_->fplog_,
+                                                      simulatorEnv_->commRec_,
+                                                      simulatorEnv_->multisimCommRec_,
+                                                      simulatorEnv_->logger_,
+                                                      legacyInput_->numFile,
+                                                      legacyInput_->filenames,
+                                                      simulatorEnv_->outputEnv_,
+                                                      simulatorConfig_->mdrunOptions_,
+                                                      simulatorConfig_->startingBehavior_,
+                                                      constraintsParam_->vsite,
+                                                      constraintsParam_->constr,
+                                                      constraintsParam_->enforcedRotation,
+                                                      boxDeformation_->deform,
+                                                      simulatorModules_->outputProvider,
+                                                      simulatorModules_->mdModulesNotifier,
+                                                      legacyInput_->inputrec,
+                                                      interactiveMD_->imdSession,
+                                                      centerOfMassPulling_->pull_work,
+                                                      ionSwapping_->ionSwap,
+                                                      topologyData_->top_global,
+                                                      simulatorStateData_->globalState_p,
+                                                      simulatorStateData_->observablesHistory_p,
+                                                      topologyData_->mdAtoms,
+                                                      profiling_->nrnb,
+                                                      profiling_->wallCycle,
+                                                      legacyInput_->forceRec,
+                                                      simulatorStateData_->enerdata_p,
+                                                      simulatorStateData_->ekindata_p,
+                                                      simulatorConfig_->runScheduleWork_,
+                                                      *replicaExchangeParameters_,
+                                                      membedHolder_->membed(),
+                                                      profiling_->walltimeAccounting,
+                                                      std::move(stopHandlerBuilder_),
+                                                      simulatorConfig_->mdrunOptions_.rerun),
                 std::move(modularSimulatorCheckpointData_)));
     }
     // 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_, legacyInput_->numFile, legacyInput_->filenames,
-            simulatorEnv_->outputEnv_, simulatorConfig_->mdrunOptions_,
-            simulatorConfig_->startingBehavior_, constraintsParam_->vsite,
-            constraintsParam_->constr, constraintsParam_->enforcedRotation, boxDeformation_->deform,
-            simulatorModules_->outputProvider, simulatorModules_->mdModulesNotifier,
-            legacyInput_->inputrec, interactiveMD_->imdSession, centerOfMassPulling_->pull_work,
-            ionSwapping_->ionSwap, topologyData_->top_global, simulatorStateData_->globalState_p,
-            simulatorStateData_->observablesHistory_p, topologyData_->mdAtoms, profiling_->nrnb,
-            profiling_->wallCycle, legacyInput_->forceRec, simulatorStateData_->enerdata_p,
-            simulatorStateData_->ekindata_p, simulatorConfig_->runScheduleWork_,
-            *replicaExchangeParameters_, membedHolder_->membed(), profiling_->walltimeAccounting,
-            std::move(stopHandlerBuilder_), simulatorConfig_->mdrunOptions_.rerun));
+    return std::unique_ptr<LegacySimulator>(new LegacySimulator(simulatorEnv_->fplog_,
+                                                                simulatorEnv_->commRec_,
+                                                                simulatorEnv_->multisimCommRec_,
+                                                                simulatorEnv_->logger_,
+                                                                legacyInput_->numFile,
+                                                                legacyInput_->filenames,
+                                                                simulatorEnv_->outputEnv_,
+                                                                simulatorConfig_->mdrunOptions_,
+                                                                simulatorConfig_->startingBehavior_,
+                                                                constraintsParam_->vsite,
+                                                                constraintsParam_->constr,
+                                                                constraintsParam_->enforcedRotation,
+                                                                boxDeformation_->deform,
+                                                                simulatorModules_->outputProvider,
+                                                                simulatorModules_->mdModulesNotifier,
+                                                                legacyInput_->inputrec,
+                                                                interactiveMD_->imdSession,
+                                                                centerOfMassPulling_->pull_work,
+                                                                ionSwapping_->ionSwap,
+                                                                topologyData_->top_global,
+                                                                simulatorStateData_->globalState_p,
+                                                                simulatorStateData_->observablesHistory_p,
+                                                                topologyData_->mdAtoms,
+                                                                profiling_->nrnb,
+                                                                profiling_->wallCycle,
+                                                                legacyInput_->forceRec,
+                                                                simulatorStateData_->enerdata_p,
+                                                                simulatorStateData_->ekindata_p,
+                                                                simulatorConfig_->runScheduleWork_,
+                                                                *replicaExchangeParameters_,
+                                                                membedHolder_->membed(),
+                                                                profiling_->walltimeAccounting,
+                                                                std::move(stopHandlerBuilder_),
+                                                                simulatorConfig_->mdrunOptions_.rerun));
 }
 
 void SimulatorBuilder::add(MembedHolder&& membedHolder)