ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.hpp
(Generate patch)

Comparing trunk/src/io/Globals.hpp (file contents):
Revision 674 by tim, Mon Oct 17 03:06:29 2005 UTC vs.
Revision 1050 by chrisfen, Fri Sep 22 22:19:59 2006 UTC

# Line 49 | Line 49
49   #include <string>
50   #include <map>
51  
52 – #include "io/BASS_interface.h"
52   #include "types/Component.hpp"
53 < #include "types/MakeStamps.hpp"
54 < #include "types/ZconStamp.hpp"
55 < #include "utils/CaseConversion.hpp"
53 > #include "types/ZconsStamp.hpp"
54 > #include "types/MoleculeStamp.hpp"
55 > #include "utils/ParameterManager.hpp"
56  
57 < template<typename T>
58 < struct ParameterTraits;
60 <
61 < //string
62 < template<>                    
63 < struct ParameterTraits<std::string>{
64 <  typedef std::string RepType;       // Representation type of the value
65 <
66 < template<typename T> static bool    convert(T v, RepType& r){return false;} // !NB everything is ok
67 < template<typename T> static RepType convert(T v)            {RepType tmp; convert(v,tmp);return tmp;}
68 <  static bool convert(RepType v, RepType& r) { r = v; return true;}
69 <  static std::string getParamType() { return "string";}  
70 < };
71 < //bool
72 < template<>                    
73 < struct ParameterTraits<bool>{
74 <  typedef bool RepType;
75 <  template<typename T> static bool    convert(T, RepType&){return false;}
76 <  template<typename T> static RepType convert(T v)        {RepType tmp; convert(v,tmp);return tmp;}
77 <  static bool convert(std::string v, RepType& r) {
78 <    oopse::toLower(v);
79 <    bool result = false;
80 <    if (v == "true") {
81 <        r = true;
82 <        result = true;
83 <    } else if (v == "false") {
84 <        r = false;
85 <        result = true;
86 <    }
87 <    
88 <     return result;
89 <  }
90 <  static std::string getParamType() { return "bool";}  
91 < };
92 <
93 < //int  
94 < template<>
95 < struct ParameterTraits<int>{
96 <    typedef int RepType;
97 <    template<typename T> static bool    convert(T, RepType&){return false;}
98 <    template<typename T> static RepType convert(T v)        {RepType tmp; convert(v,tmp);return tmp;}
99 <    static bool convert(RepType v, RepType& r)            { r=v; return true;}
100 <    static std::string getParamType() { return "int";}  
101 < };
102 <
103 < //double
104 < template<>                    
105 < struct ParameterTraits<double>{
106 <    typedef double RepType;
107 <    template<typename T> static bool    convert(T, RepType&){return false;}
108 <    template<typename T> static RepType convert(T v)        {RepType tmp; convert(v,tmp);return tmp;}
109 <    static bool convert(RepType v, RepType& r)            {r=v; return true;}
110 <    static bool convert(int v, RepType& r)                {r = static_cast<double>(v); return true;}
111 <    static std::string getParamType() { return "double";}    
112 < };
113 <
114 <
115 < class ParameterBase {
116 <  public:    
117 <    ParameterBase() : keyword_(), optional_(false), defaultValue_(false), empty_(true) {}
118 <    bool isOptional() {return optional_;}
119 <    void setOptional(bool optional) {optional_ = optional;}
120 <    bool hasDefaultValue() {return defaultValue_;}
121 <    virtual bool isValid() { return true;}
122 <    const std::string& getKeyword() {return keyword_;}
123 <    void setKeyword(const std::string& keyword) { keyword_ = keyword;}
124 <    bool empty() {return empty_;}
125 <    virtual bool setData(std::string) = 0;
126 <    virtual bool setData(int) = 0;
127 <    virtual bool setData(double) = 0;
128 <    virtual std::string getParamType() = 0;
129 <  protected:
130 <    std::string keyword_;
131 <    bool optional_;
132 <    bool defaultValue_;
133 <    bool empty_;
134 < };
135 <
136 < template<class ParamType>
137 < class Parameter : public ParameterBase{
138 <   public:    
139 <    typedef ParameterTraits<ParamType> ValueType;
140 <     void setDefaultValue(const ParamType& value) {data_ = value; defaultValue_ = true;}
141 <     ParamType getData() { return data_;}
142 <
143 <    virtual bool setData(std::string sval) {
144 <        return internalSetData<std::string>(sval);
145 <    }
146 <    virtual bool setData(int ival) {
147 <        return internalSetData<int>(ival);
148 <    }
149 <    
150 <    virtual bool setData(double dval) {
151 <        return internalSetData<double>(dval);
152 <    }
153 <
154 <    virtual std::string getParamType() { return ParameterTraits<ParamType>::getParamType();}
155 <   private:
156 <     template<class T> bool internalSetData(T data) {
157 <        ParamType tmp;
158 <        bool result = ValueType::convert(data, tmp);
159 <        if (result) {
160 <            empty_ = false;
161 <            data_ = tmp;
162 <        }
163 <        return result;
164 <     }
165 <    
166 <   private:
167 <     ParamType data_;
168 <      
169 < };
170 <
171 < #define DeclareParameter(NAME, TYPE)         \
172 <    private:                                                   \
173 <      Parameter<TYPE> NAME;                                     \
174 <    public:                                                      \
175 <      bool have##NAME() { return !NAME.empty();}  \
176 <      TYPE get##NAME() { return NAME.getData();}
177 <
178 <
179 < class Globals {
57 > namespace oopse {
58 > class Globals : public DataHolder {
59    public:
60      Globals();
61 +    virtual ~Globals();
62      
63    DeclareParameter(ForceField, std::string);
64 <  DeclareParameter(NComponents, int);  
185 <  DeclareParameter(TargetTemp, double);
64 >  DeclareParameter(TargetTemp, RealType);
65    DeclareParameter(Ensemble, std::string);
66 <  DeclareParameter(Dt, double);
67 <  DeclareParameter(RunTime, double);
68 <  DeclareParameter(InitialConfig, std::string);
66 >  DeclareParameter(Dt, RealType);
67 >  DeclareParameter(RunTime, RealType);
68 >  //DeclareParameter(InitialConfig, std::string);
69    DeclareParameter(FinalConfig, std::string);
70 <  DeclareParameter(NMol, int);
71 <  DeclareParameter(Density, double);
72 <  DeclareParameter(Box, double);
73 <  DeclareParameter(BoxX, double);
74 <  DeclareParameter(BoxY, double);
196 <  DeclareParameter(BoxZ, double);
197 <  DeclareParameter(SampleTime, double);
198 <  DeclareParameter(ResetTime, double);
199 <  DeclareParameter(StatusTime, double);
200 <  DeclareParameter(CutoffRadius, double);
201 <  DeclareParameter(SwitchingRadius, double);
202 <  DeclareParameter(Dielectric, double);
70 >  DeclareParameter(SampleTime, RealType);
71 >  DeclareParameter(ResetTime, RealType);
72 >  DeclareParameter(StatusTime, RealType);
73 >  DeclareParameter(CutoffRadius, RealType);
74 >  DeclareParameter(SwitchingRadius, RealType);
75    DeclareParameter(TempSet, bool);
76 <  DeclareParameter(ThermalTime, double);
205 <  DeclareParameter(MixingRule, std::string);
76 >  DeclareParameter(ThermalTime, RealType);
77    DeclareParameter(UsePeriodicBoundaryConditions, bool);
78 <  DeclareParameter(TargetPressure, double);
79 <  DeclareParameter(TauThermostat, double);
80 <  DeclareParameter(TauBarostat, double);
81 <  DeclareParameter(ZconsTime, double);
82 <  DeclareParameter(NZconstraints, int);
212 <  DeclareParameter(ZconsTol, double);
78 >  DeclareParameter(TargetPressure, RealType);
79 >  DeclareParameter(TauThermostat, RealType);
80 >  DeclareParameter(TauBarostat, RealType);
81 >  DeclareParameter(ZconsTime, RealType);
82 >  DeclareParameter(ZconsTol, RealType);
83    DeclareParameter(ZconsForcePolicy, std::string);
84    DeclareParameter(Seed, int);
85    DeclareParameter(UseInitalTime, bool);
86    DeclareParameter(UseIntialExtendedSystemState, bool);
87 <  DeclareParameter(OrthoBoxTolerance, double);
87 >  DeclareParameter(OrthoBoxTolerance, RealType);
88    DeclareParameter(Minimizer, std::string);
89 <  DeclareParameter(MinimizerMaxIter, double);
89 >  DeclareParameter(MinimizerMaxIter, RealType);
90    DeclareParameter(MinimizerWriteFrq, int);
91 <  DeclareParameter(MinimizerStepSize, double);
92 <  DeclareParameter(MinimizerFTol, double);
93 <  DeclareParameter(MinimizerGTol, double);
94 <  DeclareParameter(MinimizerLSTol, double);
91 >  DeclareParameter(MinimizerStepSize, RealType);
92 >  DeclareParameter(MinimizerFTol, RealType);
93 >  DeclareParameter(MinimizerGTol, RealType);
94 >  DeclareParameter(MinimizerLSTol, RealType);
95    DeclareParameter(MinimizerLSMaxIter, int);
96 <  DeclareParameter(ZconsGap, double);
97 <  DeclareParameter(ZconsFixtime, double);
96 >  DeclareParameter(ZconsGap, RealType);
97 >  DeclareParameter(ZconsFixtime, RealType);
98    DeclareParameter(ZconsUsingSMD, bool);
99    DeclareParameter(UseSolidThermInt, bool);
100    DeclareParameter(UseLiquidThermInt, bool);
101 <  DeclareParameter(ThermodynamicIntegrationLambda, double);
102 <  DeclareParameter(ThermodynamicIntegrationK, double);
101 >  DeclareParameter(ThermodynamicIntegrationLambda, RealType);
102 >  DeclareParameter(ThermodynamicIntegrationK, RealType);
103    DeclareParameter(ForceFieldVariant, std::string);
104    DeclareParameter(ForceFieldFileName, std::string);
105 <  DeclareParameter(ThermIntDistSpringConst, double);
106 <  DeclareParameter(ThermIntThetaSpringConst, double);
107 <  DeclareParameter(ThermIntOmegaSpringConst, double);
108 <  DeclareParameter(SurfaceTension, double);
105 >  DeclareParameter(ThermIntDistSpringConst, RealType);
106 >  DeclareParameter(ThermIntThetaSpringConst, RealType);
107 >  DeclareParameter(ThermIntOmegaSpringConst, RealType);
108 >  DeclareParameter(SurfaceTension, RealType);
109    DeclareParameter(PrintPressureTensor, bool);
110    DeclareParameter(ElectrostaticSummationMethod, std::string);
111 <  DeclareParameter(DampingAlpha, double);
111 >  DeclareParameter(ElectrostaticScreeningMethod, std::string);
112 >  DeclareParameter(DampingAlpha, RealType);
113 >  DeclareParameter(Dielectric, RealType);
114    DeclareParameter(CutoffPolicy, std::string);
115 +  DeclareParameter(SwitchingFunctionType, std::string);
116    DeclareParameter(CompressDumpFile, bool);
117 <  DeclareParameter(SkinThickness, double);
117 >  DeclareParameter(OutputForceVector, bool);
118 >  DeclareParameter(SkinThickness, RealType);
119    DeclareParameter(StatFileFormat, std::string);    
120 +  DeclareParameter(HydroPropFile, std::string);
121 +  DeclareParameter(Viscosity, RealType);
122 +  DeclareParameter(BeadSize, RealType);  
123 +  DeclareParameter(UseSphericalBoundaryConditions, bool);
124 +  DeclareParameter(FrozenBufferRadius, RealType);
125 +  DeclareParameter(LangevinBufferRadius, RealType);
126 +  DeclareParameter(AccumulateBoxDipole, bool);
127 +  
128 +  public:
129 +    bool addComponent(Component* comp);
130 +    bool addZConsStamp(ZConsStamp* zcons);
131 +    bool addMoleculeStamp(MoleculeStamp* molStamp);
132 +    int getNComponents() {return components_.size();}
133 +    std::vector<Component*> getComponents() {return components_;}
134 +    Component* getComponentAt(int index) {return components_.at(index);}    
135  
136 +    int getNZconsStamps() {return zconstraints_.size();}
137 +    std::vector<ZConsStamp*> getZconsStamps() {return zconstraints_;}
138 +    ZConsStamp* getZconsStampAt(int index) {return zconstraints_.at(index);}    
139 +
140 +    virtual void validate();
141    private:
248 –    typedef std::map<std::string, ParameterBase*> ParamMap;
249 –    ParamMap parameters_;
142      
143 <    Component* current_component;
144 <    Component** components; // the array of components
143 >    std::vector<Component*> components_;
144 >    std::vector<ZConsStamp*> zconstraints_;    
145 >    std::map<std::string, MoleculeStamp*> moleculeStamps_;
146  
254 –    ZconStamp* current_zConstraint;
255 –    ZconStamp** zConstraints; // the array of zConstraints
256 –
257 –    char* checkMe();
258 –
259 –  public:
260 –    int newComponent( event* the_event );
261 –    int componentAssign( event* the_event );
262 –    int componentEnd( event* the_event );
263 –
264 –    int newZconstraint( event* the_event );
265 –    int zConstraintAssign( event* the_event );
266 –    int zConstraintEnd( event* the_event );
267 –  
268 –    int globalAssign( event* the_event );
269 –    int globalEnd( event* the_event );    
270 –
271 –    ZconStamp** getZconStamp() {return zConstraints;}
272 –    Component** getComponents() {return components;}
147   };
148 + }
149   #endif
150  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines