Delete TabulatedFunctions when their owner is deleted

openmmapi/include/openmm/CustomCompoundBondForce.h

@@ -107,6 +107,7 @@ public:
      *                      and per-bond parameters
      */
     explicit CustomCompoundBondForce(int numParticles, const std::string& energy);
+    ~CustomCompoundBondForce();
     /**
      * Get the number of particles used to define each bond.
      */

openmmapi/include/openmm/CustomGBForce.h

@@ -182,6 +182,7 @@ public:
      * Create a CustomGBForce.
      */
     CustomGBForce();
+    ~CustomGBForce();
     /**
      * Get the number of particles for which force field parameters have been defined.
      */

openmmapi/include/openmm/CustomHbondForce.h

@@ -125,6 +125,7 @@ public:
      *                  per-acceptor parameters
      */
     explicit CustomHbondForce(const std::string& energy);
+    ~CustomHbondForce();
     /**
      * Get the number of donors for which force field parameters have been defined.
      */

openmmapi/include/openmm/CustomNonbondedForce.h

@@ -157,6 +157,7 @@ public:
      *                  of r, the distance between them, as well as any global and per-particle parameters
      */
     explicit CustomNonbondedForce(const std::string& energy);
+    ~CustomNonbondedForce();
     /**
      * Get the number of particles for which force field parameters have been defined.
      */

openmmapi/src/CustomCompoundBondForce.cpp

@@ -51,6 +51,12 @@ using std::vector;
 CustomCompoundBondForce::CustomCompoundBondForce(int numParticles, const string& energy) : particlesPerBond(numParticles), energyExpression(energy) {
 }
 
+
+CustomCompoundBondForce::~CustomCompoundBondForce() {
+    for (int i = 0; i < (int) functions.size(); i++)
+        delete functions[i].function;
+}
+
 const string& CustomCompoundBondForce::getEnergyFunction() const {
     return energyExpression;
 }

openmmapi/src/CustomGBForce.cpp

@@ -50,6 +50,11 @@ using std::vector;
 CustomGBForce::CustomGBForce() : nonbondedMethod(NoCutoff), cutoffDistance(1.0) {
 }
 
+CustomGBForce::~CustomGBForce() {
+    for (int i = 0; i < (int) functions.size(); i++)
+        delete functions[i].function;
+}
+
 CustomGBForce::NonbondedMethod CustomGBForce::getNonbondedMethod() const {
     return nonbondedMethod;
 }

openmmapi/src/CustomHbondForce.cpp

@@ -50,6 +50,12 @@ using std::vector;
 CustomHbondForce::CustomHbondForce(const string& energy) : energyExpression(energy), nonbondedMethod(NoCutoff), cutoffDistance(1.0) {
 }
 
+
+CustomHbondForce::~CustomHbondForce() {
+    for (int i = 0; i < (int) functions.size(); i++)
+        delete functions[i].function;
+}
+
 const string& CustomHbondForce::getEnergyFunction() const {
     return energyExpression;
 }

openmmapi/src/CustomNonbondedForce.cpp

@@ -51,6 +51,11 @@ CustomNonbondedForce::CustomNonbondedForce(const string& energy) : energyExpress
     switchingDistance(-1.0), useSwitchingFunction(false), useLongRangeCorrection(false) {
 }
 
+CustomNonbondedForce::~CustomNonbondedForce() {
+    for (int i = 0; i < (int) functions.size(); i++)
+        delete functions[i].function;
+}
+
 const string& CustomNonbondedForce::getEnergyFunction() const {
     return energyExpression;
 }