Changes to bring in line with SimTK style guide.

openmmapi/include/openmm/AndersenThermostat.h

@@ -123,7 +123,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CMAPTorsionForce.h

@@ -154,7 +154,9 @@ public:
      *
      * @returns false
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CMMotionRemover.h

@@ -67,7 +67,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CustomAngleForce.h

@@ -208,7 +208,9 @@ public:
      *
      * @returns false
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CustomBondForce.h

@@ -205,7 +205,9 @@ public:
      *
      * @returns false
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CustomCompoundBondForce.h

@@ -303,7 +303,9 @@ public:
      *
      * @returns false
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CustomExternalForce.h

@@ -205,7 +205,9 @@ public:
      *
      * @returns false
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/CustomTorsionForce.h

@@ -211,7 +211,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/HarmonicAngleForce.h

@@ -108,7 +108,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/HarmonicBondForce.h

@@ -105,7 +105,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/MonteCarloAnisotropicBarostat.h

@@ -177,7 +177,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return true;}
+    bool usesPeriodicBoundaryConditions() const {
+        return true;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/MonteCarloBarostat.h

@@ -133,7 +133,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return true;}
+    bool usesPeriodicBoundaryConditions() const {
+        return true;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/MonteCarloMembraneBarostat.h

@@ -230,7 +230,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return true;}
+    bool usesPeriodicBoundaryConditions() const {
+        return true;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/PeriodicTorsionForce.h

@@ -114,7 +114,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/RBTorsionForce.h

@@ -123,7 +123,9 @@ public:
      *
      * @returns true if force uses PBC and false otherwise
      */
-    bool usesPeriodicBoundaryConditions() const {return false;}
+    bool usesPeriodicBoundaryConditions() const {
+        return false;
+    }
 protected:
     ForceImpl* createImpl() const;
 private:

openmmapi/include/openmm/System.h

@@ -230,7 +230,7 @@ public:
      * If a force in this System does not implement usesPeriodicBoundaryConditions
      * a OpenMM::OpenMMException is thrown
      *
-     * @return true of at least one force uses PBC and false otherwise
+     * @return true if at least one force uses PBC and false otherwise
      */
     bool usesPeriodicBoundaryConditions();
 private:

openmmapi/src/System.cpp

@@ -129,7 +129,8 @@ bool System::usesPeriodicBoundaryConditions() {
         try {
             if ((*it)->usesPeriodicBoundaryConditions())
                 uses_pbc = true;
-        } catch (OpenMMException &e) {
+        }
+        catch (OpenMMException &e) {
             all_forces_implement = false;
         }
     }

platforms/reference/tests/TestReferenceCustomGBForce.cpp

@@ -140,7 +140,8 @@ void testOBC(GBSAOBCForce::NonbondedMethod obcMethod, CustomGBForce::NonbondedMe
         ASSERT(obc->usesPeriodicBoundaryConditions());
         ASSERT(standardSystem.usesPeriodicBoundaryConditions());
         ASSERT(customSystem.usesPeriodicBoundaryConditions());
-    } else {
+    }
+    else {
         ASSERT(!custom->usesPeriodicBoundaryConditions());
         ASSERT(!obc->usesPeriodicBoundaryConditions());
         ASSERT(!standardSystem.usesPeriodicBoundaryConditions());
@@ -539,7 +540,8 @@ static void buildEthane( GBVIForce* gbviForce, std::vector<Vec3>& positions ) {
        C_gamma  = -0.2863;
        H_radius =  0.125;
        H_gamma  =  0.2437;
-    } else {
+    }
+    else {
        C_radius =  0.215;
        C_gamma  = -1.1087;
        H_radius =  0.150;
@@ -617,7 +619,8 @@ static void buildDimer( GBVIForce* gbviForce, std::vector<Vec3>& positions ) {
        C_gamma  = -0.2863;
        H_radius =  0.125;
        H_gamma  =  0.2437;
-    } else {
+    }
+    else {
        C_radius =  0.215;
        C_gamma  = -1.1087;
        H_radius =  0.150;
@@ -744,7 +747,8 @@ static void findScaledRadii( GBVIForce& gbviForce, std::vector<double> & scaledR
             }
             scaledRadiusJ = radiusJ;
 //             errors++;
-        } else {
+        }
+        else {
 
             double rJ2    = radiusJ*radiusJ;
     
@@ -774,7 +778,8 @@ static void findScaledRadii( GBVIForce& gbviForce, std::vector<double> & scaledR
             scaledRadiusJ  = (radiusJ*radiusJ*radiusJ) - 0.125*scaledRadiusJ; 
             if( scaledRadiusJ > 0.0 ){
                 scaledRadiusJ  = 0.95*pow( scaledRadiusJ, (1.0/3.0) );
-            } else {
+            }
+            else {
                 scaledRadiusJ  = 0.0;
             }
         }
@@ -849,9 +854,11 @@ void testGBVI(GBVIForce::NonbondedMethod gbviMethod, CustomGBForce::NonbondedMet
 
     if( molecule == "Monomer" ){
         buildMonomer( gbvi, positions );
-    } else if( molecule == "Dimer" ){
+    }
+    else if( molecule == "Dimer" ){
         buildDimer( gbvi, positions );
-    } else {
+    }
+    else {
         buildEthane( gbvi, positions );
     }
 

platforms/reference/tests/TestReferenceCustomManyParticleForce.cpp

@@ -66,7 +66,8 @@ void validateAxilrodTeller(CustomManyParticleForce* force, const vector<Vec3>& p
     if (force->getNonbondedMethod() == CustomManyParticleForce::CutoffPeriodic) {
         ASSERT(force->usesPeriodicBoundaryConditions());
         ASSERT(system.usesPeriodicBoundaryConditions());
-    } else {
+    }
+    else {
         ASSERT(!force->usesPeriodicBoundaryConditions());
         ASSERT(!system.usesPeriodicBoundaryConditions());
     }

platforms/reference/tests/TestReferenceGBVIForce.cpp

@@ -128,7 +128,8 @@ void testEnergyEthane( int applyBornRadiiScaling ) {
        C_gamma  = -0.2863;
        H_radius =  0.125;
        H_gamma  =  0.2437;
-    } else {
+    }
+    else {
        C_radius =  0.215;
        C_gamma  = -1.1087;
        H_radius =  0.150;
@@ -144,7 +145,8 @@ void testEnergyEthane( int applyBornRadiiScaling ) {
     GBVIForce* forceField = new GBVIForce();
     if( applyBornRadiiScaling ){
         forceField->setBornRadiusScalingMethod( GBVIForce::QuinticSpline );
-    } else {
+    }
+    else {
         forceField->setBornRadiusScalingMethod( GBVIForce::NoScaling );
     }
     for( int i = 0; i < numParticles; i++ ){