Commit c4e26638 authored by Peter Eastman's avatar Peter Eastman
Browse files

Fixed test cases for serializing AMOEBA forces

parent b723e4af
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -80,6 +82,7 @@ void testSerialization() { ...@@ -80,6 +82,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -75,6 +77,7 @@ void testSerialization() { ...@@ -75,6 +77,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -94,6 +96,7 @@ void testSerialization() { ...@@ -94,6 +96,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -85,6 +87,7 @@ void testSerialization() { ...@@ -85,6 +87,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
static void getCovalentTypes( std::vector<std::string>& covalentTypes ){ static void getCovalentTypes( std::vector<std::string>& covalentTypes ){
covalentTypes.push_back( "Covalent12" ); covalentTypes.push_back( "Covalent12" );
...@@ -186,6 +188,7 @@ void testSerialization() { ...@@ -186,6 +188,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -84,6 +86,7 @@ void testSerialization() { ...@@ -84,6 +86,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -74,6 +76,7 @@ void testSerialization() { ...@@ -74,6 +76,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -79,6 +81,7 @@ void testSerialization() { ...@@ -79,6 +81,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
static void loadTorsionTorsionGrid( std::vector< std::vector< std::vector<double> > >& gridVector ){ static void loadTorsionTorsionGrid( std::vector< std::vector< std::vector<double> > >& gridVector ){
static const int gridSize = 25; static const int gridSize = 25;
...@@ -133,6 +135,7 @@ void testSerialization() { ...@@ -133,6 +135,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -120,6 +122,7 @@ void testSerialization() { ...@@ -120,6 +122,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
using namespace OpenMM; using namespace OpenMM;
using namespace std; using namespace std;
extern "C" void registerAmoebaSerializationProxies();
void testSerialization() { void testSerialization() {
// Create a Force. // Create a Force.
...@@ -99,6 +101,7 @@ void testSerialization() { ...@@ -99,6 +101,7 @@ void testSerialization() {
int main() { int main() {
try { try {
registerAmoebaSerializationProxies();
testSerialization(); testSerialization();
} }
catch(const exception& e) { catch(const exception& e) {
......
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