Commit c6116ba4 authored by peastman's avatar peastman
Browse files

Revert changes that caused segfault

parent 44e668cb
...@@ -112,7 +112,6 @@ SKIP_METHODS = [('State', 'getPositions'), ...@@ -112,7 +112,6 @@ SKIP_METHODS = [('State', 'getPositions'),
('LocalCoordinatesSite', 'getOriginWeights', 0), ('LocalCoordinatesSite', 'getOriginWeights', 0),
('LocalCoordinatesSite', 'getXWeights', 0), ('LocalCoordinatesSite', 'getXWeights', 0),
('LocalCoordinatesSite', 'getYWeights', 0), ('LocalCoordinatesSite', 'getYWeights', 0),
('CompoundIntegrator', 'getIntegrator'),
] ]
# The build script assumes method args that are non-const references are # The build script assumes method args that are non-const references are
...@@ -149,6 +148,7 @@ STEAL_OWNERSHIP = {("Platform", "registerPlatform") : [0], ...@@ -149,6 +148,7 @@ STEAL_OWNERSHIP = {("Platform", "registerPlatform") : [0],
("CustomManyParticleForce", "addTabulatedFunction") : [1], ("CustomManyParticleForce", "addTabulatedFunction") : [1],
("CustomCVForce", "addTabulatedFunction") : [1], ("CustomCVForce", "addTabulatedFunction") : [1],
("CustomCVForce", "addCollectiveVariable") : [1], ("CustomCVForce", "addCollectiveVariable") : [1],
("CompoundIntegrator", "addIntegrator") : [0],
} }
......
...@@ -205,13 +205,6 @@ Parameters: ...@@ -205,13 +205,6 @@ Parameters:
%} %}
} }
%extend OpenMM::CompoundIntegrator {
%pythoncode %{
def getIntegrator(self, index):
return self._integrators[index]
%}
}
%extend OpenMM::System { %extend OpenMM::System {
%pythoncode %{ %pythoncode %{
def __getstate__(self): def __getstate__(self):
......
...@@ -28,14 +28,6 @@ from simtk.openmm.vec3 import Vec3 ...@@ -28,14 +28,6 @@ from simtk.openmm.vec3 import Vec3
self._integrator = args[1] self._integrator = args[1]
%} %}
%pythonappend OpenMM::CompoundIntegrator::CompoundIntegrator %{
self._integrators = []
%}
%pythonprepend OpenMM::CompoundIntegrator::addIntegrator %{
self._integrators.append(integrator)
%}
%pythonprepend OpenMM::AmoebaAngleForce::addAngle %{ %pythonprepend OpenMM::AmoebaAngleForce::addAngle %{
try: try:
length = args[3] length = args[3]
......
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