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 749 by tim, Wed Nov 16 23:10:02 2005 UTC vs.
Revision 914 by tim, Thu Mar 23 15:02:02 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"
56 <
53 > #include "types/ZconsStamp.hpp"
54 > #include "types/MoleculeStamp.hpp"
55   #include "utils/ParameterManager.hpp"
56  
57 < class Globals {
57 > namespace oopse {
58 > class Globals : public DataHolder {
59    public:
60      Globals();
61 <    ~Globals();
61 >    virtual ~Globals();
62      
63    DeclareParameter(ForceField, std::string);
65  DeclareParameter(NComponents, int);  
64    DeclareParameter(TargetTemp, double);
65    DeclareParameter(Ensemble, std::string);
66    DeclareParameter(Dt, double);
67    DeclareParameter(RunTime, double);
68    DeclareParameter(InitialConfig, std::string);
69    DeclareParameter(FinalConfig, std::string);
72  DeclareParameter(NMol, int);
73  DeclareParameter(Density, double);
74  DeclareParameter(Box, double);
75  DeclareParameter(BoxX, double);
76  DeclareParameter(BoxY, double);
77  DeclareParameter(BoxZ, double);
70    DeclareParameter(SampleTime, double);
71    DeclareParameter(ResetTime, double);
72    DeclareParameter(StatusTime, double);
# Line 83 | Line 75 | class Globals {
75    DeclareParameter(Dielectric, double);
76    DeclareParameter(TempSet, bool);
77    DeclareParameter(ThermalTime, double);
86  DeclareParameter(MixingRule, std::string);
78    DeclareParameter(UsePeriodicBoundaryConditions, bool);
79    DeclareParameter(TargetPressure, double);
80    DeclareParameter(TauThermostat, double);
81    DeclareParameter(TauBarostat, double);
82    DeclareParameter(ZconsTime, double);
92  DeclareParameter(NZconstraints, int);
83    DeclareParameter(ZconsTol, double);
84    DeclareParameter(ZconsForcePolicy, std::string);
85    DeclareParameter(Seed, int);
# Line 127 | Line 117 | class Globals {
117    DeclareParameter(OutputForceVector, bool);
118    DeclareParameter(SkinThickness, double);
119    DeclareParameter(StatFileFormat, std::string);    
120 +  DeclareParameter(HydroPropFile, std::string);
121 +  DeclareParameter(Viscosity, double);
122 +  DeclareParameter(BeadSize, double);  
123 +  
124 +  public:
125 +    bool addComponent(Component* comp);
126 +    bool addZConsStamp(ZConsStamp* zcons);
127 +    bool addMoleculeStamp(MoleculeStamp* molStamp);
128 +    int getNComponents() {return components_.size();}
129 +    std::vector<Component*> getComponents() {return components_;}
130 +    Component* getComponentAt(int index) {return components_.at(index);}    
131  
132 +    int getNZconsStamps() {return zconstraints_.size();}
133 +    std::vector<ZConsStamp*> getZconsStamps() {return zconstraints_;}
134 +    ZConsStamp* getZconsStampAt(int index) {return zconstraints_.at(index);}    
135 +
136 +    virtual void validate();
137    private:
132    typedef std::map<std::string, ParameterBase*> ParamMap;
133    ParamMap parameters_;
138      
139 <    Component* current_component;
140 <    Component** components; // the array of components
139 >    std::vector<Component*> components_;
140 >    std::vector<ZConsStamp*> zconstraints_;    
141 >    std::map<std::string, MoleculeStamp*> moleculeStamps_;
142  
138    ZconStamp* current_zConstraint;
139    ZconStamp** zConstraints; // the array of zConstraints
140
141    char* checkMe();
142
143  public:
144    int newComponent( event* the_event );
145    int componentAssign( event* the_event );
146    int componentEnd( event* the_event );
147
148    int newZconstraint( event* the_event );
149    int zConstraintAssign( event* the_event );
150    int zConstraintEnd( event* the_event );
151  
152    int globalAssign( event* the_event );
153    int globalEnd( event* the_event );    
154
155    ZconStamp** getZconStamp() {return zConstraints;}
156    Component** getComponents() {return components;}
143   };
144 + }
145   #endif
146  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines