ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/brains/ForceField.hpp
(Generate patch)

Comparing trunk/src/UseTheForce/ForceField.hpp (file contents):
Revision 1268 by chuckv, Fri Jul 6 18:15:03 2007 UTC vs.
Revision 1269 by gezelter, Tue Jul 1 13:28:23 2008 UTC

# Line 53 | Line 53
53   #include "config.h"
54   #include <string>
55   #include <utility>
56 + #include <vector>
57  
58   #include "io/basic_ifstrstream.hpp"
59   #include "io/ForceFieldOptions.hpp"
60   #include "utils/TypeContainer.hpp"
61 + #include "utils/Tuple.hpp"
62   #include "types/AtomType.hpp"
63   #include "types/BondType.hpp"
64   #include "types/BendType.hpp"
# Line 147 | Line 149 | namespace oopse {
149      ForceFieldOptions& getForceFieldOptions() {return forceFieldOptions_;}
150  
151      void setFortranForceOptions(void);
152 +
153 +
154    protected:
155  
156      AtomTypeContainer atomTypeCont_;    
# Line 162 | Line 166 | namespace oopse {
166      std::string wildCardAtomTypeName_;
167  
168      std::string forceFieldFileName_;
165  };
169  
170 <
170 >
171 >  };
172   }//end namespace oopse
173   #endif
174  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines