[ViewVC] Diff of: OpenMD/trunk/src/brains/ForceField.cpp

Comparing branches/development/src/UseTheForce/ForceField.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC

#	Line 52 \| Line 52
52		#include "utils/simError.h"
53		#include "utils/Tuple.hpp"
54		#include "UseTheForce/DarkSide/atype_interface.h"
55	–	#include "UseTheForce/DarkSide/fForceOptions_interface.h"
56	–	#include "UseTheForce/DarkSide/switcheroo_interface.h"
55		namespace OpenMD {
56
57		ForceField::ForceField() {
#	Line 72 \| Line 70 \| namespace OpenMD {
70
71		ForceField::~ForceField() {
72		deleteAtypes();
75	–	deleteSwitch();
73		}
74
75		AtomType* ForceField::getAtomType(const std::string &at) {
#	Line 631 \| Line 628 \| namespace OpenMD {
628		return ffStream;
629		}
630
634	–	void ForceField::setFortranForceOptions(){
635	–	ForceOptions theseFortranOptions;
636	–	forceFieldOptions_.makeFortranOptions(theseFortranOptions);
637	–	setfForceOptions(&theseFortranOptions);
638	–	}
631		} //end namespace OpenMD

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