| 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 |  | /** | 
| 109 |  |  | 
| 110 |  | //avoid make virtual function public | 
| 111 |  | //Herb Sutter and Andrei Alexandrescu, C++ coding Standards, Addision-Wesley | 
| 112 | < | virtual double getRcutFromAtomType(AtomType* at); | 
| 112 | > | virtual RealType getRcutFromAtomType(AtomType* at); | 
| 113 |  |  | 
| 114 |  | std::string getWildCard() { | 
| 115 |  | return wildCardAtomTypeName_; | 
| 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 |  |  |