Commit e4be7792 authored by Peter Eastman's avatar Peter Eastman
Browse files

Parameter file reader did not recognize \r as a delimiter

parent e37555bb
...@@ -334,7 +334,7 @@ static char* readLine( FILE* filePtr, StringVector& tokens, int* lineCount, FILE ...@@ -334,7 +334,7 @@ static char* readLine( FILE* filePtr, StringVector& tokens, int* lineCount, FILE
//static const std::string methodName = "readLine"; //static const std::string methodName = "readLine";
std::string delimiter = " \n"; std::string delimiter = " \r\n";
const int bufferSize = 4096; const int bufferSize = 4096;
char buffer[bufferSize]; char buffer[bufferSize];
...@@ -2192,6 +2192,7 @@ static int readAmoebaMultipoleParameters( FILE* filePtr, MapStringInt& forceMap, ...@@ -2192,6 +2192,7 @@ static int readAmoebaMultipoleParameters( FILE* filePtr, MapStringInt& forceMap,
} }
} else if( field.compare( "AmoebaMultipoleEnd" ) == 0 ){ } else if( field.compare( "AmoebaMultipoleEnd" ) == 0 ){
printf("here\n");
done++; done++;
} else if( field.compare( AMOEBA_MULTIPOLE_ROTATION_MATRICES ) == 0 || } else if( field.compare( AMOEBA_MULTIPOLE_ROTATION_MATRICES ) == 0 ||
field.compare( AMOEBA_MULTIPOLE_ROTATED ) == 0 || field.compare( AMOEBA_MULTIPOLE_ROTATED ) == 0 ||
......
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