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
54d474a6
Commit
54d474a6
authored
Jan 03, 2015
by
peastman
Browse files
Merge pull request #762 from swails/is_periodic
Implements `usesPeriodicBoundaryConditions` on `Force`s and `System`
parents
19ccd0f8
1f15a914
Changes
71
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
179 additions
and
0 deletions
+179
-0
openmmapi/include/openmm/AndersenThermostat.h
openmmapi/include/openmm/AndersenThermostat.h
+9
-0
openmmapi/include/openmm/CMAPTorsionForce.h
openmmapi/include/openmm/CMAPTorsionForce.h
+9
-0
openmmapi/include/openmm/CMMotionRemover.h
openmmapi/include/openmm/CMMotionRemover.h
+9
-0
openmmapi/include/openmm/CustomAngleForce.h
openmmapi/include/openmm/CustomAngleForce.h
+9
-0
openmmapi/include/openmm/CustomBondForce.h
openmmapi/include/openmm/CustomBondForce.h
+9
-0
openmmapi/include/openmm/CustomCompoundBondForce.h
openmmapi/include/openmm/CustomCompoundBondForce.h
+9
-0
openmmapi/include/openmm/CustomExternalForce.h
openmmapi/include/openmm/CustomExternalForce.h
+9
-0
openmmapi/include/openmm/CustomGBForce.h
openmmapi/include/openmm/CustomGBForce.h
+9
-0
openmmapi/include/openmm/CustomHbondForce.h
openmmapi/include/openmm/CustomHbondForce.h
+9
-0
openmmapi/include/openmm/CustomManyParticleForce.h
openmmapi/include/openmm/CustomManyParticleForce.h
+9
-0
openmmapi/include/openmm/CustomNonbondedForce.h
openmmapi/include/openmm/CustomNonbondedForce.h
+9
-0
openmmapi/include/openmm/CustomTorsionForce.h
openmmapi/include/openmm/CustomTorsionForce.h
+9
-0
openmmapi/include/openmm/Force.h
openmmapi/include/openmm/Force.h
+8
-0
openmmapi/include/openmm/GBSAOBCForce.h
openmmapi/include/openmm/GBSAOBCForce.h
+9
-0
openmmapi/include/openmm/GBVIForce.h
openmmapi/include/openmm/GBVIForce.h
+9
-0
openmmapi/include/openmm/HarmonicAngleForce.h
openmmapi/include/openmm/HarmonicAngleForce.h
+9
-0
openmmapi/include/openmm/HarmonicBondForce.h
openmmapi/include/openmm/HarmonicBondForce.h
+9
-0
openmmapi/include/openmm/MonteCarloAnisotropicBarostat.h
openmmapi/include/openmm/MonteCarloAnisotropicBarostat.h
+9
-0
openmmapi/include/openmm/MonteCarloBarostat.h
openmmapi/include/openmm/MonteCarloBarostat.h
+9
-0
openmmapi/include/openmm/MonteCarloMembraneBarostat.h
openmmapi/include/openmm/MonteCarloMembraneBarostat.h
+9
-0
No files found.
openmmapi/include/openmm/AndersenThermostat.h
View file @
54d474a6
...
@@ -117,6 +117,15 @@ public:
...
@@ -117,6 +117,15 @@ public:
void
setRandomNumberSeed
(
int
seed
)
{
void
setRandomNumberSeed
(
int
seed
)
{
randomNumberSeed
=
seed
;
randomNumberSeed
=
seed
;
}
}
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CMAPTorsionForce.h
View file @
54d474a6
...
@@ -148,6 +148,15 @@ public:
...
@@ -148,6 +148,15 @@ public:
* @param b4 the index of the fourth particle forming the second torsion
* @param b4 the index of the fourth particle forming the second torsion
*/
*/
void
setTorsionParameters
(
int
index
,
int
map
,
int
a1
,
int
a2
,
int
a3
,
int
a4
,
int
b1
,
int
b2
,
int
b3
,
int
b4
);
void
setTorsionParameters
(
int
index
,
int
map
,
int
a1
,
int
a2
,
int
a3
,
int
a4
,
int
b1
,
int
b2
,
int
b3
,
int
b4
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns false
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CMMotionRemover.h
View file @
54d474a6
...
@@ -61,6 +61,15 @@ public:
...
@@ -61,6 +61,15 @@ public:
void
setFrequency
(
int
freq
)
{
void
setFrequency
(
int
freq
)
{
frequency
=
freq
;
frequency
=
freq
;
}
}
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomAngleForce.h
View file @
54d474a6
...
@@ -202,6 +202,15 @@ public:
...
@@ -202,6 +202,15 @@ public:
* the Context. The set of particles involved in a angle cannot be changed, nor can new angles be added.
* the Context. The set of particles involved in a angle cannot be changed, nor can new angles be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns false
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomBondForce.h
View file @
54d474a6
...
@@ -199,6 +199,15 @@ public:
...
@@ -199,6 +199,15 @@ public:
* the Context. The set of particles involved in a bond cannot be changed, nor can new bonds be added.
* the Context. The set of particles involved in a bond cannot be changed, nor can new bonds be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns false
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomCompoundBondForce.h
View file @
54d474a6
...
@@ -297,6 +297,15 @@ public:
...
@@ -297,6 +297,15 @@ public:
* the Context. The set of particles involved in a bond cannot be changed, nor can new bonds be added.
* the Context. The set of particles involved in a bond cannot be changed, nor can new bonds be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns false
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomExternalForce.h
View file @
54d474a6
...
@@ -199,6 +199,15 @@ public:
...
@@ -199,6 +199,15 @@ public:
* the Context. Also, this method cannot be used to add new particles, only to change the parameters of existing ones.
* the Context. Also, this method cannot be used to add new particles, only to change the parameters of existing ones.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns false
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomGBForce.h
View file @
54d474a6
...
@@ -523,6 +523,15 @@ public:
...
@@ -523,6 +523,15 @@ public:
* the Context. Also, this method cannot be used to add new particles, only to change the parameters of existing ones.
* the Context. Also, this method cannot be used to add new particles, only to change the parameters of existing ones.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
CustomGBForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomHbondForce.h
View file @
54d474a6
...
@@ -443,6 +443,15 @@ public:
...
@@ -443,6 +443,15 @@ public:
* new donors or acceptors be added.
* new donors or acceptors be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
CustomHbondForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomManyParticleForce.h
View file @
54d474a6
...
@@ -461,6 +461,15 @@ public:
...
@@ -461,6 +461,15 @@ public:
* the parameters of existing ones.
* the parameters of existing ones.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
CustomManyParticleForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomNonbondedForce.h
View file @
54d474a6
...
@@ -464,6 +464,15 @@ public:
...
@@ -464,6 +464,15 @@ public:
* the parameters of existing ones.
* the parameters of existing ones.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
CustomNonbondedForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/CustomTorsionForce.h
View file @
54d474a6
...
@@ -205,6 +205,15 @@ public:
...
@@ -205,6 +205,15 @@ public:
* the Context. The set of particles involved in a torsion cannot be changed, nor can new torsions be added.
* the Context. The set of particles involved in a torsion cannot be changed, nor can new torsions be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/Force.h
View file @
54d474a6
...
@@ -78,6 +78,14 @@ public:
...
@@ -78,6 +78,14 @@ public:
* @param group the group index. Legal values are between 0 and 31 (inclusive).
* @param group the group index. Legal values are between 0 and 31 (inclusive).
*/
*/
void
setForceGroup
(
int
group
);
void
setForceGroup
(
int
group
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions. This method should be overridden for all Force subclasses, or
* a OpenMM::OpenMMException will be thrown
*
* @return true if Force uses periodic boundaries or false if it does not
*/
virtual
bool
usesPeriodicBoundaryConditions
()
const
;
protected:
protected:
friend
class
ContextImpl
;
friend
class
ContextImpl
;
/**
/**
...
...
openmmapi/include/openmm/GBSAOBCForce.h
View file @
54d474a6
...
@@ -184,6 +184,15 @@ public:
...
@@ -184,6 +184,15 @@ public:
* change the parameters of existing ones.
* change the parameters of existing ones.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
GBSAOBCForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/GBVIForce.h
View file @
54d474a6
...
@@ -229,6 +229,15 @@ public:
...
@@ -229,6 +229,15 @@ public:
* Set the upper limit used in the quintic spline scaling method, measured in nm (~5.0)
* Set the upper limit used in the quintic spline scaling method, measured in nm (~5.0)
*/
*/
void
setQuinticUpperBornRadiusLimit
(
double
quinticUpperBornRadiusLimit
);
void
setQuinticUpperBornRadiusLimit
(
double
quinticUpperBornRadiusLimit
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
nonbondedMethod
==
GBVIForce
::
CutoffPeriodic
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/HarmonicAngleForce.h
View file @
54d474a6
...
@@ -102,6 +102,15 @@ public:
...
@@ -102,6 +102,15 @@ public:
* in a angle cannot be changed, nor can new angles be added.
* in a angle cannot be changed, nor can new angles be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/HarmonicBondForce.h
View file @
54d474a6
...
@@ -99,6 +99,15 @@ public:
...
@@ -99,6 +99,15 @@ public:
* in a bond cannot be changed, nor can new bonds be added.
* in a bond cannot be changed, nor can new bonds be added.
*/
*/
void
updateParametersInContext
(
Context
&
context
);
void
updateParametersInContext
(
Context
&
context
);
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
false
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/MonteCarloAnisotropicBarostat.h
View file @
54d474a6
...
@@ -171,6 +171,15 @@ public:
...
@@ -171,6 +171,15 @@ public:
void
setRandomNumberSeed
(
int
seed
)
{
void
setRandomNumberSeed
(
int
seed
)
{
randomNumberSeed
=
seed
;
randomNumberSeed
=
seed
;
}
}
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
true
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/MonteCarloBarostat.h
View file @
54d474a6
...
@@ -127,6 +127,15 @@ public:
...
@@ -127,6 +127,15 @@ public:
void
setRandomNumberSeed
(
int
seed
)
{
void
setRandomNumberSeed
(
int
seed
)
{
randomNumberSeed
=
seed
;
randomNumberSeed
=
seed
;
}
}
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
true
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
openmmapi/include/openmm/MonteCarloMembraneBarostat.h
View file @
54d474a6
...
@@ -224,6 +224,15 @@ public:
...
@@ -224,6 +224,15 @@ public:
void
setRandomNumberSeed
(
int
seed
)
{
void
setRandomNumberSeed
(
int
seed
)
{
randomNumberSeed
=
seed
;
randomNumberSeed
=
seed
;
}
}
/**
* Returns whether or not this force makes use of periodic boundary
* conditions.
*
* @returns true if force uses PBC and false otherwise
*/
bool
usesPeriodicBoundaryConditions
()
const
{
return
true
;
}
protected:
protected:
ForceImpl
*
createImpl
()
const
;
ForceImpl
*
createImpl
()
const
;
private:
private:
...
...
Prev
1
2
3
4
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