Merge pull request #1781 from peastman/setmethod

Added error checking to setNonbondedMethod()

openmmapi/src/CustomGBForce.cpp

@@ -60,6 +60,8 @@ CustomGBForce::NonbondedMethod CustomGBForce::getNonbondedMethod() const {
 }
 
 void CustomGBForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("CustomGBForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/CustomHbondForce.cpp

@@ -69,6 +69,8 @@ CustomHbondForce::NonbondedMethod CustomHbondForce::getNonbondedMethod() const {
 }
 
 void CustomHbondForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("CustomHbondForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/CustomManyParticleForce.cpp

@@ -65,6 +65,8 @@ CustomManyParticleForce::NonbondedMethod CustomManyParticleForce::getNonbondedMe
 }
 
 void CustomManyParticleForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("CustomManyParticleForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/CustomNonbondedForce.cpp

@@ -87,6 +87,8 @@ CustomNonbondedForce::NonbondedMethod CustomNonbondedForce::getNonbondedMethod()
 }
 
 void CustomNonbondedForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("CustomNonbondedForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/GBSAOBCForce.cpp

@@ -64,6 +64,8 @@ GBSAOBCForce::NonbondedMethod GBSAOBCForce::getNonbondedMethod() const {
 }
 
 void GBSAOBCForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("GBSAOBCForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/GayBerneForce.cpp

@@ -55,6 +55,8 @@ GayBerneForce::NonbondedMethod GayBerneForce::getNonbondedMethod() const {
 }
 
 void GayBerneForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 2)
+        throw OpenMMException("GayBerneForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

openmmapi/src/NonbondedForce.cpp

@@ -57,6 +57,8 @@ NonbondedForce::NonbondedMethod NonbondedForce::getNonbondedMethod() const {
 }
 
 void NonbondedForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 5)
+        throw OpenMMException("NonbondedForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

plugins/amoeba/openmmapi/src/AmoebaMultipoleForce.cpp

@@ -52,6 +52,8 @@ AmoebaMultipoleForce::NonbondedMethod AmoebaMultipoleForce::getNonbondedMethod()
 }
 
 void AmoebaMultipoleForce::setNonbondedMethod(AmoebaMultipoleForce::NonbondedMethod method) {
+    if (method < 0 || method > 1)
+        throw OpenMMException("AmoebaMultipoleForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }
 

plugins/amoeba/openmmapi/src/AmoebaVdwForce.cpp

@@ -123,6 +123,8 @@ AmoebaVdwForce::NonbondedMethod AmoebaVdwForce::getNonbondedMethod() const {
 }
 
 void AmoebaVdwForce::setNonbondedMethod(NonbondedMethod method) {
+    if (method < 0 || method > 1)
+        throw OpenMMException("AmoebaVdwForce: Illegal value for nonbonded method");
     nonbondedMethod = method;
 }