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 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 906 by tim, Fri Mar 17 23:20:35 2006 UTC

# Line 75 | Line 75 | class Globals : public DataHolder {
75    DeclareParameter(Dielectric, double);
76    DeclareParameter(TempSet, bool);
77    DeclareParameter(ThermalTime, double);
78 –  DeclareParameter(MixingRule, std::string);
78    DeclareParameter(UsePeriodicBoundaryConditions, bool);
79    DeclareParameter(TargetPressure, double);
80    DeclareParameter(TauThermostat, double);
# Line 118 | Line 117 | class Globals : public DataHolder {
117    DeclareParameter(OutputForceVector, bool);
118    DeclareParameter(SkinThickness, double);
119    DeclareParameter(StatFileFormat, std::string);    
120 <
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 133 | Line 135 | class Globals : public DataHolder {
135  
136      virtual void validate();
137    private:
138 +
139 +    void parseHydroPropFile(const std::string& filename);
140 +    
141      std::vector<Component*> components_;
142      std::vector<ZConsStamp*> zconstraints_;    
143      std::map<std::string, MoleculeStamp*> moleculeStamps_;

Diff Legend

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