Skip to content

GitLab

Commit 3c45b7ca authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

Fix for force copy

parent 085a43be
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
platforms/cuda/tests/TestCudaGBVIForce2.cpp
View file @ 3c45b7ca
...@@ -1980,7 +1980,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -1980,7 +1980,7 @@ static Force* copyForce( const Force& force, FILE* log ){
#ifdef INCLUDE_AMOEBA_FORCES #ifdef INCLUDE_AMOEBA_FORCES
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaHarmonicBondForce& castForce = dynamic_cast<const AmoebaHarmonicBondForce&>(force); const AmoebaHarmonicBondForce& castForce = dynamic_cast<const AmoebaHarmonicBondForce&>(force);
...@@ -1989,7 +1989,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -1989,7 +1989,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaHarmonicAngleForce& castForce = dynamic_cast<const AmoebaHarmonicAngleForce&>(force); const AmoebaHarmonicAngleForce& castForce = dynamic_cast<const AmoebaHarmonicAngleForce&>(force);
...@@ -1998,7 +1998,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -1998,7 +1998,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaHarmonicInPlaneAngleForce& castForce = dynamic_cast<const AmoebaHarmonicInPlaneAngleForce&>(force); const AmoebaHarmonicInPlaneAngleForce& castForce = dynamic_cast<const AmoebaHarmonicInPlaneAngleForce&>(force);
...@@ -2007,7 +2007,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2007,7 +2007,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaMultipoleForce& castForce = dynamic_cast<const AmoebaMultipoleForce&>(force); const AmoebaMultipoleForce& castForce = dynamic_cast<const AmoebaMultipoleForce&>(force);
...@@ -2016,7 +2016,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2016,7 +2016,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaOutOfPlaneBendForce& castForce = dynamic_cast<const AmoebaOutOfPlaneBendForce&>(force); const AmoebaOutOfPlaneBendForce& castForce = dynamic_cast<const AmoebaOutOfPlaneBendForce&>(force);
...@@ -2025,7 +2025,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2025,7 +2025,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaPiTorsionForce& castForce = dynamic_cast<const AmoebaPiTorsionForce&>(force); const AmoebaPiTorsionForce& castForce = dynamic_cast<const AmoebaPiTorsionForce&>(force);
...@@ -2034,7 +2034,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2034,7 +2034,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaStretchBendForce& castForce = dynamic_cast<const AmoebaStretchBendForce&>(force); const AmoebaStretchBendForce& castForce = dynamic_cast<const AmoebaStretchBendForce&>(force);
...@@ -2043,7 +2043,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2043,7 +2043,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaTorsionForce& castForce = dynamic_cast<const AmoebaTorsionForce&>(force); const AmoebaTorsionForce& castForce = dynamic_cast<const AmoebaTorsionForce&>(force);
...@@ -2052,7 +2052,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2052,7 +2052,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaTorsionTorsionForce& castForce = dynamic_cast<const AmoebaTorsionTorsionForce&>(force); const AmoebaTorsionTorsionForce& castForce = dynamic_cast<const AmoebaTorsionTorsionForce&>(force);
...@@ -2061,7 +2061,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2061,7 +2061,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaUreyBradleyForce& castForce = dynamic_cast<const AmoebaUreyBradleyForce&>(force); const AmoebaUreyBradleyForce& castForce = dynamic_cast<const AmoebaUreyBradleyForce&>(force);
...@@ -2070,7 +2070,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2070,7 +2070,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaVdwForce& castForce = dynamic_cast<const AmoebaVdwForce&>(force); const AmoebaVdwForce& castForce = dynamic_cast<const AmoebaVdwForce&>(force);
...@@ -2079,7 +2079,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2079,7 +2079,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaWcaDispersionForce& castForce = dynamic_cast<const AmoebaWcaDispersionForce&>(force); const AmoebaWcaDispersionForce& castForce = dynamic_cast<const AmoebaWcaDispersionForce&>(force);
...@@ -2088,7 +2088,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2088,7 +2088,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaGeneralizedKirkwoodForce& castForce = dynamic_cast<const AmoebaGeneralizedKirkwoodForce&>(force); const AmoebaGeneralizedKirkwoodForce& castForce = dynamic_cast<const AmoebaGeneralizedKirkwoodForce&>(force);
...@@ -2097,7 +2097,7 @@ static Force* copyForce( const Force& force, FILE* log ){ ...@@ -2097,7 +2097,7 @@ static Force* copyForce( const Force& force, FILE* log ){
} }
} }
if( forceCopy != NULL ){ if( forceCopy == NULL ){
try { try {
const AmoebaTorsionTorsionForce& castForce = dynamic_cast<const AmoebaTorsionTorsionForce&>(force); const AmoebaTorsionTorsionForce& castForce = dynamic_cast<const AmoebaTorsionTorsionForce&>(force);
......
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