ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/ForceFieldOptions.hpp
(Generate patch)

Comparing branches/development/src/io/ForceFieldOptions.hpp (file contents):
Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC vs.
Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 46 | Line 46
46   #include "utils/ParameterManager.hpp"
47   #include "utils/StringUtils.hpp"
48   #include "io/ParamConstraint.hpp"
49 – #define __OPENMD_C
50 – #include "UseTheForce/fForceOptions.h"
49  
50   namespace OpenMD {
51    
# Line 102 | Line 100 | namespace OpenMD {
100          } else{
101            result = i->second->setData(value);
102          }
103 +
104 +        if (!result) {
105 +          sprintf(painCave.errMsg,  
106 +                  "Unrecognized data type for keyword: %s = %s\n",
107 +                  keyword.c_str(), value.c_str() );
108 +          painCave.isFatal = 1;
109 +          simError();                  
110 +        }
111        } else {
112          sprintf(painCave.errMsg,  "%s is an unrecognized keyword\n", keyword.c_str() );
113          painCave.isFatal = 0;
# Line 111 | Line 117 | namespace OpenMD {
117        return result;
118      }
119  
114 –    void makeFortranOptions(ForceOptions & fortranForceOptions);
120    private:
121      typedef std::map<std::string, ParameterBase*> ParamMap;
122      ParamMap parameters_;                  

Diff Legend

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