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

Comparing trunk/src/integrators/RNEMD.hpp (file contents):
Revision 1330 by skuang, Thu Mar 19 21:03:36 2009 UTC vs.
Revision 1350 by gezelter, Thu May 21 18:56:45 2009 UTC

# Line 51 | Line 51
51   #define INTEGRATORS_RNEMD_HPP
52   #include "brains/SimInfo.hpp"
53   #include "math/RandNumGen.hpp"
54 + #include "selection/SelectionEvaluator.hpp"
55 + #include "selection/SelectionManager.hpp"
56  
57   namespace oopse {
58  
# Line 64 | Line 66 | namespace oopse {
66      virtual ~RNEMD();
67          
68      void doSwap();
69 +    void getStatus();
70      void set_RNEMD_swapTime(RealType swapTime) { swapTime_ = swapTime; }
71      void set_RNEMD_nBins(int nbins) { nBins_ = nbins; }
72      RealType get_RNEMD_exchange_total() { return exchangeSum_; }
73      void set_RNEMD_exchange_total(RealType et) {exchangeSum_ = et;}
74 <        
74 >
75    private:
76 <        
76 >
77      enum RNEMDTypeEnum {
78        rnemdKinetic,
79        rnemdPx,
# Line 86 | Line 89 | namespace oopse {
89      RealType exchangeSum_;
90      RNEMDTypeEnum rnemdType_;
91      std::map<std::string, RNEMDTypeEnum> stringToEnumMap_;
92 +    std::string rnemdObjectSelection_;
93 +    SelectionManager seleMan_;
94 +    SelectionEvaluator evaluator_;
95 +    bool usePeriodicBoundaryConditions_;
96  
90
97    };
98  
99   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines