From d05188bbf61620598217dc7c2dc0e732f38b85e1 Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Sun, 15 Nov 2020 22:00:00 +0300 Subject: [PATCH] One argument per line for long function signatures. Fixes #3833 --- .clang-format | 2 +- src/gromacs/mdrun/simulatorbuilder.cpp | 98 ++++++++++++++++++-------- 2 files changed, 69 insertions(+), 31 deletions(-) diff --git a/.clang-format b/.clang-format index 600e45a532..b189deb7e2 100644 --- 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 f1ed995d53..8a0e4edf1b 100644 --- a/src/gromacs/mdrun/simulatorbuilder.cpp +++ b/src/gromacs/mdrun/simulatorbuilder.cpp @@ -128,39 +128,77 @@ std::unique_ptr SimulatorBuilder::build(bool useModularSimulator) { // NOLINTNEXTLINE(modernize-make-unique): make_unique does not work with private constructor return std::unique_ptr(new ModularSimulator( - std::make_unique( - 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(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(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(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) -- 2.22.0