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 2520 by chuckv, Wed Dec 28 21:42:43 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"
62   #include "types/BendType.hpp"
63   #include "types/TorsionType.hpp"
64 <
64 > #include "UseTheForce/fForceOptions.h"
65   namespace oopse {
66  
67    /**
# Line 138 | Line 137 | namespace oopse {
137  
138      ifstrstream* openForceFieldFile(const std::string& filename);
139  
140 +    ForceFieldOptions& getForceFieldOptions() {return forceFieldOptions_;}
141 +
142 +    void setFortranForceOptions(void);
143    protected:
144  
145      AtomTypeContainer atomTypeCont_;    
146      BondTypeContainer bondTypeCont_;
147      BendTypeContainer bendTypeCont_;
148      TorsionTypeContainer torsionTypeCont_;
149 <        
149 >    ForceFieldOptions forceFieldOptions_;
150 >    
151    private:  
152      std::string ffPath_;
153  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines