ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/brains/ForceField.cpp

Comparing:
trunk/src/UseTheForce/ForceField.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (file contents), Revision 1473 by gezelter, Tue Jul 20 15:43:00 2010 UTC

#	Line 57 | Line 57 | namespace OpenMD {
57		namespace OpenMD {
58
59		ForceField::ForceField() {
60	+
61		char* tempPath;
62		tempPath = getenv("FORCE_PARAM_PATH");
63	<
63	>
64		if (tempPath == NULL) {
65		//convert a macro from compiler to a string in c++
66		STR_DEFINE(ffPath_, FRC_PATH );
#	Line 71 | Line 72 | namespace OpenMD {
72
73		ForceField::~ForceField() {
74		deleteAtypes();
75	<	deleteSwitch();
75	>	deleteSwitch();
76		}
77
78		AtomType* ForceField::getAtomType(const std::string &at) {

Comparing:
trunk/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/UseTheForce/ForceField.cpp (property svn:keywords), Revision 1473 by gezelter, Tue Jul 20 15:43:00 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines