ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/UseTheForce/ForceField.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/UseTheForce/ForceField.hpp (file contents):
Revision 2211 by chrisfen, Thu Apr 21 14:12:19 2005 UTC vs.
Revision 2461 by gezelter, Mon Nov 21 22:59:02 2005 UTC

# Line 50 | Line 50
50   #ifndef USETHEFORCE_FORCEFIELD_HPP
51   #define USETHEFORCE_FORCEFIELD_HPP
52  
53 < #define MK_STR(s) # s
54 < #define STR_DEFINE(t, s) t = MK_STR(s)
55 <
53 > #include "config.h"
54   #include <string>
55   #include <utility>
56  
57   #include "io/basic_ifstrstream.hpp"
58 + #include "io/ForceFieldOptions.hpp"
59   #include "utils/TypeContainer.hpp"
60   #include "types/AtomType.hpp"
61   #include "types/BondType.hpp"
# Line 138 | Line 137 | namespace oopse {
137  
138      ifstrstream* openForceFieldFile(const std::string& filename);
139  
140 +    ForceFieldOptions& getForceFieldOptions() {return forceFieldOptions_;}
141    protected:
142  
143      AtomTypeContainer atomTypeCont_;    
144      BondTypeContainer bondTypeCont_;
145      BendTypeContainer bendTypeCont_;
146      TorsionTypeContainer torsionTypeCont_;
147 <        
147 >    ForceFieldOptions forceFieldOptions_;
148 >    
149    private:  
150      std::string ffPath_;
151  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines