[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/UseTheForce/ForceField.cpp

Comparing branches/new_design/OOPSE-2.0/src/UseTheForce/ForceField.cpp (file contents):
Revision 1739 by tim, Fri Nov 12 17:40:03 2004 UTC vs.
Revision 1740 by tim, Mon Nov 15 23:00:32 2004 UTC

-+
-+
+ifstrstream* ForceField::openForceFiledFile(const std::string& filename) {
-+
+    std::string forceFieldFilename(filename);
-+
+    ifstrstream* ffStream = new ifstrstream();
-+
-+
+    //try to open the force filed file in current directory first
-+
+    ffStream.open(forceFieldFilename.c_str());
-+
+    if(!ffStream.is_open()){
-+
-+
+        forceFieldFilename = ffPath_ + "/" + forceFieldFilename;
-+
+        ffStream.open( forceFieldFilename.c_str() );
-+
-+
+        //if current directory does not contain the force field file,
-+
+        //try to open it in the path
-+
+        if(!ffStream.is_open()){
-+
-+
+            sprintf( painCave.errMsg,
-+
+               "Error opening the force field parameter file:\n"
-+
+               "\t%s\n"
-+
+               "\tHave you tried setting the FORCE_PARAM_PATH environment "
-+
+               "variable?\n",
-+
+               forceFieldFilename.c_str() );
-+
+            painCave.severity = OOPSE_ERROR;
-+
+            painCave.isFatal = 1;
-+
+            simError();
-+
+        }
-+
+    }
-+
-+
+    return ffStream;
-+
-+
+}
-+
+} //end namespace oopse

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