Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
b8f6d269
Commit
b8f6d269
authored
Jan 02, 2015
by
Jason Swails
Browse files
Changes to bring in line with SimTK style guide.
parent
ab82c962
Changes
33
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
38 additions
and
13 deletions
+38
-13
platforms/reference/tests/TestReferenceNonbondedForce.cpp
platforms/reference/tests/TestReferenceNonbondedForce.cpp
+2
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
...openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
...amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
...ns/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
...oeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
...ns/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
.../amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
...oeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
+3
-1
plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
...moeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
+3
-1
plugins/drude/openmmapi/include/openmm/DrudeForce.h
plugins/drude/openmmapi/include/openmm/DrudeForce.h
+3
-1
No files found.
platforms/reference/tests/TestReferenceNonbondedForce.cpp
View file @
b8f6d269
...
@@ -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
());
}
}
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaAngleForce.h
View file @
b8f6d269
...
@@ -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
;
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaBondForce.h
View file @
b8f6d269
...
@@ -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
;
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaGeneralizedKirkwoodForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaInPlaneAngleForce.h
View file @
b8f6d269
...
@@ -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
;
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaMultipoleForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaOutOfPlaneBendForce.h
View file @
b8f6d269
...
@@ -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
;
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaPiTorsionForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaStretchBendForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaTorsionTorsionForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaVdwForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/amoeba/openmmapi/include/openmm/AmoebaWcaDispersionForce.h
View file @
b8f6d269
...
@@ -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:
...
...
plugins/drude/openmmapi/include/openmm/DrudeForce.h
View file @
b8f6d269
...
@@ -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:
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment