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

Comparing trunk/src/brains/ForceField.cpp (file contents):
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1905 by gezelter, Wed Jul 17 20:39:58 2013 UTC

#	Line 80 \| Line 80 \| namespace OpenMD {
80
81		namespace OpenMD {
82
83	<	ForceField::ForceField(std::string ffName) {
83	>	ForceField::ForceField(std::string ffName): wildCardAtomTypeName_("X") {
84
85		char* tempPath;
86		tempPath = getenv("FORCE_PARAM_PATH");
#	Line 761 \| Line 761 \| namespace OpenMD {
761		ifstrstream* ffStream = new ifstrstream();
762
763		//try to open the force filed file in current directory first
764	<	ffStream->open(forceFieldFilename.c_str(), ifstream::in \| ifstream::binary);
765	<
764	>	ffStream->open(forceFieldFilename.c_str());
765		if(!ffStream->is_open()){
766
767		forceFieldFilename = ffPath_ + "/" + forceFieldFilename;
768	<	ffStream->open( forceFieldFilename.c_str(),
770	<	ifstream::in \| ifstream::binary );
768	>	ffStream->open( forceFieldFilename.c_str() );
769
770		//if current directory does not contain the force field file,
771		//try to open it in the path

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