ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/nonbonded/GB.cpp
(Generate patch)

Comparing branches/development/src/nonbonded/GB.cpp (file contents):
Revision 1874 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC

# Line 182 | Line 182 | namespace OpenMD {
182          eS2 = eX2;
183          eE2 = eX2;
184          dw2 = 1.0;
185 <      }
185 >      } else {
186 >        sprintf( painCave.errMsg,
187 >                 "GB::addType found an atomType (%s) that does not\n"
188 >                 "\tappear to be a Gay-Berne or Lennard-Jones atom.\n",
189 >                 atype2->getName().c_str());
190 >        painCave.severity = OPENMD_ERROR;
191 >        painCave.isFatal = 1;
192 >        simError();
193 >      }
194 >
195                        
196        GBInteractionData mixer1, mixer2;    
197        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines