Code cleanup (#5127)

openmmapi/src/CustomCPPForceImpl.cpp

@@ -50,7 +50,5 @@ double CustomCPPForceImpl::calcForcesAndEnergy(ContextImpl& context, bool includ
 }
 
 vector<string> CustomCPPForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomCPPForceKernel::Name());
-    return names;
+    return {CalcCustomCPPForceKernel::Name()};
 }

openmmapi/src/CustomCVForceImpl.cpp

@@ -85,9 +85,7 @@ double CustomCVForceImpl::calcForcesAndEnergy(ContextImpl& context, bool include
 }
 
 vector<string> CustomCVForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomCVForceKernel::Name());
-    return names;
+    return {CalcCustomCVForceKernel::Name()};
 }
 
 vector<pair<int, int> > CustomCVForceImpl::getBondedParticles() const {

openmmapi/src/CustomCentroidBondForceImpl.cpp

@@ -125,9 +125,7 @@ double CustomCentroidBondForceImpl::calcForcesAndEnergy(ContextImpl& context, bo
 }
 
 vector<string> CustomCentroidBondForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomCentroidBondForceKernel::Name());
-    return names;
+    return {CalcCustomCentroidBondForceKernel::Name()};
 }
 
 map<string, double> CustomCentroidBondForceImpl::getDefaultParameters() {

openmmapi/src/CustomCompoundBondForceImpl.cpp

@@ -111,9 +111,7 @@ double CustomCompoundBondForceImpl::calcForcesAndEnergy(ContextImpl& context, bo
 }
 
 vector<string> CustomCompoundBondForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomCompoundBondForceKernel::Name());
-    return names;
+    return {CalcCustomCompoundBondForceKernel::Name()};
 }
 
 map<string, double> CustomCompoundBondForceImpl::getDefaultParameters() {

openmmapi/src/CustomExternalForceImpl.cpp

@@ -82,9 +82,7 @@ double CustomExternalForceImpl::calcForcesAndEnergy(ContextImpl& context, bool i
 }
 
 vector<string> CustomExternalForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomExternalForceKernel::Name());
-    return names;
+    return {CalcCustomExternalForceKernel::Name()};
 }
 
 map<string, double> CustomExternalForceImpl::getDefaultParameters() {

openmmapi/src/CustomGBForceImpl.cpp

@@ -112,9 +112,7 @@ double CustomGBForceImpl::calcForcesAndEnergy(ContextImpl& context, bool include
 }
 
 vector<string> CustomGBForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomGBForceKernel::Name());
-    return names;
+    return {CalcCustomGBForceKernel::Name()};
 }
 
 map<string, double> CustomGBForceImpl::getDefaultParameters() {

openmmapi/src/CustomHbondForceImpl.cpp

@@ -185,9 +185,7 @@ double CustomHbondForceImpl::calcForcesAndEnergy(ContextImpl& context, bool incl
 }
 
 vector<string> CustomHbondForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomHbondForceKernel::Name());
-    return names;
+    return {CalcCustomHbondForceKernel::Name()};
 }
 
 map<string, double> CustomHbondForceImpl::getDefaultParameters() {

openmmapi/src/CustomIntegrator.cpp

@@ -98,9 +98,7 @@ void CustomIntegrator::stateChanged(State::DataType changed) {
 }
 
 vector<string> CustomIntegrator::getKernelNames() {
-    vector<string> names;
-    names.push_back(IntegrateCustomStepKernel::Name());
-    return names;
+    return {IntegrateCustomStepKernel::Name()};
 }
 
 double CustomIntegrator::computeKineticEnergy() {

openmmapi/src/CustomManyParticleForceImpl.cpp

@@ -141,9 +141,7 @@ double CustomManyParticleForceImpl::calcForcesAndEnergy(ContextImpl& context, bo
 }
 
 vector<string> CustomManyParticleForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomManyParticleForceKernel::Name());
-    return names;
+    return {CalcCustomManyParticleForceKernel::Name()};
 }
 
 map<string, double> CustomManyParticleForceImpl::getDefaultParameters() {

openmmapi/src/CustomNonbondedForceImpl.cpp

@@ -145,9 +145,7 @@ double CustomNonbondedForceImpl::calcForcesAndEnergy(ContextImpl& context, bool
 }
 
 vector<string> CustomNonbondedForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomNonbondedForceKernel::Name());
-    return names;
+    return {CalcCustomNonbondedForceKernel::Name()};
 }
 
 map<string, double> CustomNonbondedForceImpl::getDefaultParameters() {

openmmapi/src/CustomTorsionForceImpl.cpp

@@ -84,9 +84,7 @@ double CustomTorsionForceImpl::calcForcesAndEnergy(ContextImpl& context, bool in
 }
 
 vector<string> CustomTorsionForceImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(CalcCustomTorsionForceKernel::Name());
-    return names;
+    return {CalcCustomTorsionForceKernel::Name()};
 }
 
 map<string, double> CustomTorsionForceImpl::getDefaultParameters() {

openmmapi/src/DPDIntegrator.cpp

@@ -114,9 +114,7 @@ void DPDIntegrator::cleanup() {
 }
 
 vector<string> DPDIntegrator::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(IntegrateDPDStepKernel::Name());
-    return names;
+    return {IntegrateDPDStepKernel::Name()};
 }
 
 double DPDIntegrator::computeKineticEnergy() {

openmmapi/src/GBSAOBCForceImpl.cpp

@@ -70,9 +70,7 @@ double GBSAOBCForceImpl::calcForcesAndEnergy(ContextImpl& context, bool includeF
 }
 
 std::vector<std::string> GBSAOBCForceImpl::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(CalcGBSAOBCForceKernel::Name());
-    return names;
+    return {CalcGBSAOBCForceKernel::Name()};
 }
 
 void GBSAOBCForceImpl::updateParametersInContext(ContextImpl& context) {

openmmapi/src/GayBerneForceImpl.cpp

@@ -127,9 +127,7 @@ double GayBerneForceImpl::calcForcesAndEnergy(ContextImpl& context, bool include
 }
 
 std::vector<std::string> GayBerneForceImpl::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(CalcGayBerneForceKernel::Name());
-    return names;
+    return {CalcGayBerneForceKernel::Name()};
 }
 
 void GayBerneForceImpl::updateParametersInContext(ContextImpl& context) {

openmmapi/src/HarmonicAngleForceImpl.cpp

@@ -75,9 +75,7 @@ double HarmonicAngleForceImpl::calcForcesAndEnergy(ContextImpl& context, bool in
 }
 
 std::vector<std::string> HarmonicAngleForceImpl::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(CalcHarmonicAngleForceKernel::Name());
-    return names;
+    return {CalcHarmonicAngleForceKernel::Name()};
 }
 
 void HarmonicAngleForceImpl::updateParametersInContext(ContextImpl& context, int firstAngle, int lastAngle) {

openmmapi/src/HarmonicBondForceImpl.cpp

@@ -71,9 +71,7 @@ double HarmonicBondForceImpl::calcForcesAndEnergy(ContextImpl& context, bool inc
 }
 
 std::vector<std::string> HarmonicBondForceImpl::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(CalcHarmonicBondForceKernel::Name());
-    return names;
+    return {CalcHarmonicBondForceKernel::Name()};
 }
 
 vector<pair<int, int> > HarmonicBondForceImpl::getBondedParticles() const {

openmmapi/src/LangevinMiddleIntegrator.cpp

@@ -72,9 +72,7 @@ void LangevinMiddleIntegrator::cleanup() {
 }
 
 vector<string> LangevinMiddleIntegrator::getKernelNames() {
-    std::vector<std::string> names;
-    names.push_back(IntegrateLangevinMiddleStepKernel::Name());
-    return names;
+    return {IntegrateLangevinMiddleStepKernel::Name()};
 }
 
 double LangevinMiddleIntegrator::computeKineticEnergy() {

openmmapi/src/MonteCarloAnisotropicBarostatImpl.cpp

@@ -142,18 +142,14 @@ void MonteCarloAnisotropicBarostatImpl::updateContextState(ContextImpl& context,
 }
 
 map<string, double> MonteCarloAnisotropicBarostatImpl::getDefaultParameters() {
-    map<string, double> parameters;
-    parameters[MonteCarloAnisotropicBarostat::PressureX()] = getOwner().getDefaultPressure()[0];
-    parameters[MonteCarloAnisotropicBarostat::PressureY()] = getOwner().getDefaultPressure()[1];
-    parameters[MonteCarloAnisotropicBarostat::PressureZ()] = getOwner().getDefaultPressure()[2];
-    parameters[MonteCarloAnisotropicBarostat::Temperature()] = getOwner().getDefaultTemperature();
-    return parameters;
+    return {{MonteCarloAnisotropicBarostat::PressureX(), getOwner().getDefaultPressure()[0]},
+            {MonteCarloAnisotropicBarostat::PressureY(), getOwner().getDefaultPressure()[1]},
+            {MonteCarloAnisotropicBarostat::PressureZ(), getOwner().getDefaultPressure()[2]},
+            {MonteCarloAnisotropicBarostat::Temperature(), getOwner().getDefaultTemperature()}};
 }
 
 vector<string> MonteCarloAnisotropicBarostatImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(ApplyMonteCarloBarostatKernel::Name());
-    return names;
+    return {ApplyMonteCarloBarostatKernel::Name()};
 }
 
 Vec3 MonteCarloAnisotropicBarostatImpl::computeCurrentPressure(ContextImpl& context) {

openmmapi/src/MonteCarloBarostatImpl.cpp

@@ -112,16 +112,12 @@ void MonteCarloBarostatImpl::updateContextState(ContextImpl& context, bool& forc
 }
 
 map<string, double> MonteCarloBarostatImpl::getDefaultParameters() {
-    map<string, double> parameters;
-    parameters[MonteCarloBarostat::Pressure()] = getOwner().getDefaultPressure();
-    parameters[MonteCarloBarostat::Temperature()] = getOwner().getDefaultTemperature();
-    return parameters;
+    return {{MonteCarloBarostat::Pressure(), getOwner().getDefaultPressure()},
+            {MonteCarloBarostat::Temperature(), getOwner().getDefaultTemperature()}};
 }
 
 vector<string> MonteCarloBarostatImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(ApplyMonteCarloBarostatKernel::Name());
-    return names;
+    return {ApplyMonteCarloBarostatKernel::Name()};
 }
 
 double MonteCarloBarostatImpl::computeCurrentPressure(ContextImpl& context) {

openmmapi/src/MonteCarloFlexibleBarostatImpl.cpp

@@ -138,16 +138,12 @@ void MonteCarloFlexibleBarostatImpl::updateContextState(ContextImpl& context, bo
 }
 
 map<string, double> MonteCarloFlexibleBarostatImpl::getDefaultParameters() {
-    map<string, double> parameters;
-    parameters[MonteCarloFlexibleBarostat::Pressure()] = getOwner().getDefaultPressure();
-    parameters[MonteCarloFlexibleBarostat::Temperature()] = getOwner().getDefaultTemperature();
-    return parameters;
+    return {{MonteCarloFlexibleBarostat::Pressure(), getOwner().getDefaultPressure()},
+            {MonteCarloFlexibleBarostat::Temperature(), getOwner().getDefaultTemperature()}};
 }
 
 vector<string> MonteCarloFlexibleBarostatImpl::getKernelNames() {
-    vector<string> names;
-    names.push_back(ApplyMonteCarloBarostatKernel::Name());
-    return names;
+    return {ApplyMonteCarloBarostatKernel::Name()};
 }
 
 void MonteCarloFlexibleBarostatImpl::computeCurrentPressure(ContextImpl& context, vector<double>& pressure) {