ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new-templateless/OOPSE/libmdtools/SimInfo.hpp
(Generate patch)

Comparing:
trunk/OOPSE/libmdtools/SimInfo.hpp (file contents), Revision 841 by mmeineke, Wed Oct 29 17:55:28 2003 UTC vs.
branches/new-templateless/OOPSE/libmdtools/SimInfo.hpp (file contents), Revision 851 by mmeineke, Wed Nov 5 19:18:17 2003 UTC

# Line 1 | Line 1
1   #ifndef __SIMINFO_H__
2   #define __SIMINFO_H__
3  
4 #include <map>
5 #include <string>
6 #include <vector>
7
4   #include "Atom.hpp"
5   #include "Molecule.hpp"
6   #include "AbstractClasses.hpp"
# Line 143 | Line 139 | class SimInfo{ (public)
139    void setDefaultEcr( double theEcr );
140    void setEcr( double theEcr, double theEst );
141    void setDefaultEcr( double theEcr, double theEst );
142 +  void checkCutOffs( void );
143  
144    double getRcut( void )  { return rCut; }
145    double getRlist( void ) { return rList; }
# Line 172 | Line 169 | class SimInfo{ (public)
169    
170    SimState* getConfiguration( void ) { return myConfiguration; }
171    
172 <  void addProperty(GenericData* prop);
173 <  GenericData* getProperty(const string& propName);
177 <  vector<GenericData*> getProperties();      
172 >  GenericData* getProperty(char* propName);
173 >  GenericData* getProperties() {return properties; }
174  
175    int getSeed(void) {  return seed; }
176    void setSeed(int theSeed) {  seed = theSeed;}
# Line 201 | Line 197 | class SimInfo{ (public)
197    void calcHmatInv( void );
198    void calcBoxL();
199    double calcMaxCutOff();
204  void checkCutOffs( void );
200  
201 +
202    // private function to initialize the fortran side of the simulation
203    setFortranSim_TD setFsimulation;
204  
# Line 211 | Line 207 | class SimInfo{ (public)
207    notifyFortranCutOff_TD notifyFortranCutOffs;
208    
209    //Addtional Properties of SimInfo
210 <  map<string, GenericData*> properties;
210 >  GenericData* properties;
211  
212   };
213  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines