Commit b8f6d269 authored by Jason Swails's avatar Jason Swails
Browse files

Changes to bring in line with SimTK style guide.

parent ab82c962
...@@ -450,7 +450,8 @@ void testSwitchingFunction(NonbondedForce::NonbondedMethod method) { ...@@ -450,7 +450,8 @@ void testSwitchingFunction(NonbondedForce::NonbondedMethod method) {
if (method == NonbondedForce::PME) { if (method == NonbondedForce::PME) {
ASSERT(nonbonded->usesPeriodicBoundaryConditions()); ASSERT(nonbonded->usesPeriodicBoundaryConditions());
ASSERT(system.usesPeriodicBoundaryConditions()); ASSERT(system.usesPeriodicBoundaryConditions());
} else { }
else {
ASSERT(!nonbonded->usesPeriodicBoundaryConditions()); ASSERT(!nonbonded->usesPeriodicBoundaryConditions());
ASSERT(!system.usesPeriodicBoundaryConditions()); ASSERT(!system.usesPeriodicBoundaryConditions());
} }
......
...@@ -172,7 +172,9 @@ public: ...@@ -172,7 +172,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK; double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK;
......
...@@ -144,7 +144,9 @@ public: ...@@ -144,7 +144,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
double _globalQuarticK, _globalCubicK; double _globalQuarticK, _globalCubicK;
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
......
...@@ -169,7 +169,9 @@ public: ...@@ -169,7 +169,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -177,7 +177,9 @@ public: ...@@ -177,7 +177,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK; double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK;
......
...@@ -355,7 +355,9 @@ public: ...@@ -355,7 +355,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return nonbondedMethod == AmoebaMultipoleForce::PME;} bool usesPeriodicBoundaryConditions() const {
return nonbondedMethod == AmoebaMultipoleForce::PME;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -169,7 +169,9 @@ public: ...@@ -169,7 +169,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK; double _globalCubicK, _globalQuarticK, _globalPenticK, _globalSexticK;
......
...@@ -119,7 +119,9 @@ public: ...@@ -119,7 +119,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -122,7 +122,9 @@ public: ...@@ -122,7 +122,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -143,7 +143,9 @@ public: ...@@ -143,7 +143,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -218,7 +218,9 @@ public: ...@@ -218,7 +218,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return nonbondedMethod == AmoebaVdwForce::CutoffPeriodic;} bool usesPeriodicBoundaryConditions() const {
return nonbondedMethod == AmoebaVdwForce::CutoffPeriodic;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -127,7 +127,9 @@ public: ...@@ -127,7 +127,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
...@@ -168,7 +168,9 @@ public: ...@@ -168,7 +168,9 @@ public:
* *
* @returns true if nonbondedMethod uses PBC and false otherwise * @returns true if nonbondedMethod uses PBC and false otherwise
*/ */
bool usesPeriodicBoundaryConditions() const {return false;} bool usesPeriodicBoundaryConditions() const {
return false;
}
protected: protected:
ForceImpl* createImpl() const; ForceImpl* createImpl() const;
private: private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment