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 2448 by tim, Wed Nov 16 23:10:02 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  
# Line 63 | Line 61
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 140 | Line 138 | namespace oopse {
138      ifstrstream* openForceFieldFile(const std::string& filename);
139  
140      ForceFieldOptions& getForceFieldOptions() {return forceFieldOptions_;}
141 +
142 +    void setFortranForceOptions(void);
143    protected:
144  
145      AtomTypeContainer atomTypeCont_;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines