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 895 by tim, Mon Mar 13 22:42:40 2006 UTC vs.
Revision 914 by tim, Thu Mar 23 15:02:02 2006 UTC

# Line 118 | Line 118 | class Globals : public DataHolder {
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);
# Line 132 | Line 135 | class Globals : public DataHolder {
135  
136      virtual void validate();
137    private:
135 –
136 –    void parseHydroPropFile(const std::string& filename);
138      
139      std::vector<Component*> components_;
140      std::vector<ZConsStamp*> zconstraints_;    

Diff Legend

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