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

Comparing:
branches/development/src/integrators/RNEMD.hpp (file contents), Revision 1728 by jmarr, Wed May 30 16:07:03 2012 UTC vs.
branches/development/src/rnemd/RNEMD.hpp (file contents), Revision 1773 by gezelter, Tue Aug 7 18:26:40 2012 UTC

# Line 59 | Line 59 | namespace OpenMD {
59   using namespace std;
60   namespace OpenMD {
61  
62 –  /**
63 –   * @class RNEMD RNEMD.hpp "integrators/RNEMD.hpp"
64 –   * @todo document
65 –   */
62    class RNEMD {
63    public:
64      RNEMD(SimInfo* info);
# Line 70 | Line 66 | namespace OpenMD {
66      
67      void doRNEMD();
68      void doSwap();
69 <    void doScale();
70 <    void doShiftScale();
69 >    void doNIVS();
70 >    void doVSS();
71      void collectData();
72      void getStarted();
73 <    void getStatus();
74 <    void set_RNEMD_exchange_time(RealType exchangeTime) {
75 <      exchangeTime_ = exchangeTime;
76 <    }
77 <    void set_RNEMD_nBins(int nbins) { nBins_ = nbins; }
78 <    void set_RNEMD_logWidth(int logWidth) { rnemdLogWidth_ = logWidth; }
83 <    void set_RNEMD_exchange_total(RealType et) { exchangeSum_ = et; }
84 <    void set_RNEMD_target_flux(RealType targetFlux) {targetFlux_ = targetFlux;}
85 <    void set_RNEMD_target_JzKE(RealType targetJzKE) {targetJzKE_ = targetJzKE;}
86 <    void set_RNEMD_target_jzpx(RealType targetJzpx) {targetJzpx_ = targetJzpx;}
87 <    void set_RNEMD_target_jzpy(RealType targetJzpy) {targetJzpy_ = targetJzpy;}
88 <    void set_RNEMD_target_jzpz(RealType targetJzpz) {targetJzpz_ = targetJzpz;}
89 <    void set_RNEMD_target_jzpz2(RealType targetJzpz2) {targetJzpz2_ = targetJzpz2;}
90 <    RealType get_RNEMD_exchange_total() { return exchangeSum_; }
73 >    bool inSlabA(Vector3d pos);
74 >    bool inSlabB(Vector3d pos);
75 >    void parseOutputFileFormat(const std::string& format);
76 >    void writeOutputFile();
77 >    void writeReal(int index, unsigned int bin);
78 >    void writeVector(int index, unsigned int bin);
79  
80    private:
81  
82 <    enum RNEMDTypeEnum {
83 <      rnemdKineticSwap,
84 <      rnemdKineticScale,
85 <      rnemdKineticScaleVAM,
86 <      rnemdKineticScaleAM,
99 <      rnemdPxScale,
100 <      rnemdPyScale,
101 <      rnemdPzScale,
102 <      rnemdPx,
103 <      rnemdPy,
104 <      rnemdPz,
105 <      rnemdShiftScaleV,
106 <      rnemdShiftScaleVAM,
107 <      rnemdUnknown
82 >    enum RNEMDMethod {
83 >      rnemdSwap,
84 >      rnemdNIVS,
85 >      rnemdVSS,
86 >      rnemdUnkownMethod
87      };
88 +    enum RNEMDFluxType {
89 +      rnemdKE,       // translational kinetic energy flux
90 +      rnemdRotKE,    // rotational kinetic energy flux
91 +      rnemdFullKE,   // full kinetic energy flux
92 +      rnemdPx,       // flux of momentum along x axis
93 +      rnemdPy,       // flux of momentum along y axis
94 +      rnemdPz,       // flux of momentum along z axis
95 +      rnemdPvector,  // flux of momentum vector
96 +      rnemdKePx,     // flux of translational KE and x-momentum
97 +      rnemdKePy,     // flux of translational KE and y-momentum
98 +      rnemdKePvector, // full combo platter
99 +      rnemdUnknownFluxType
100 +    };
101 +
102 +    enum OutputFields {
103 +      BEGININDEX = 0,
104 +      Z = BEGININDEX,
105 +      TEMPERATURE,
106 +      VELOCITY,
107 +      DENSITY,
108 +      ENDINDEX
109 +    };
110 +
111 +    struct OutputData {
112 +      string title;
113 +      string units;
114 +      string dataType;
115 +      vector<Accumulator*> accumulator;
116 +    };
117 +
118 +    typedef bitset<ENDINDEX-BEGININDEX> OutputBitSet;
119 +    typedef map<string, OutputFields> OutputMapType;
120      
121      SimInfo* info_;
122 <    RandNumGen* randNumGen_;
123 <    map<string, RNEMDTypeEnum> stringToEnumMap_;
124 <    RNEMDTypeEnum rnemdType_;
122 >
123 >    map<string, RNEMDMethod> stringToMethod_;
124 >    map<string, RNEMDFluxType> stringToFluxType_;
125 >    RNEMDMethod rnemdMethod_;
126 >    RNEMDFluxType rnemdFluxType_;
127      string rnemdObjectSelection_;
128      SelectionEvaluator evaluator_;
129      SelectionManager seleMan_;
130      bool usePeriodicBoundaryConditions_;
131 <    bool outputTemp_;
132 <    bool outputVx_;
133 <    bool outputVy_;
134 <    bool output3DTemp_;
135 <    bool outputRotTemp_;
136 <    // James put this in.
137 <    bool outputDen_;
138 <    bool outputVz_;
139 <    int nBins_; /**< The number of bins to divide the simulation box into.  */
140 <    /*!
141 <      The middle bin for the RNEMD method. midBin_ = nBins_/2;
142 <      Depending on the setting of the flux, this box should contain the minimum energy (temperature)
143 <      within the simulation.
144 <    */
132 <    int midBin_;
133 <    int rnemdLogWidth_; /**< Number of elements to print out in logs */
134 <    RealType zShift_;
131 >    int nBins_;
132 >    RealType slabWidth_;
133 >    RealType slabACenter_;
134 >    RealType slabBCenter_;
135 >
136 >    RealType kineticFlux_;        // target or desired *flux*
137 >    Vector3d momentumFluxVector_; // target or desired *flux*
138 >
139 >    RealType kineticTarget_;     // target or desired one-time exchange energy
140 >    Vector3d momentumTarget_;    // target or desired one-time exchange momentum
141 >
142 >    RealType kineticExchange_;    // actual exchange energy (running total)
143 >    Vector3d momentumExchange_;   // actual exchange momentum (running total)
144 >
145      RealType exchangeTime_;
146 <    RealType targetFlux_;
137 <    RealType targetJzKE_;
138 <    RealType targetJzpx_;
139 <    RealType targetJzpy_;
140 <    RealType targetJzpz_;
146 >
147      RealType targetJzpz2_;
142 –    Vector3d jzp_, njzp_;
143 –    RealType exchangeSum_;
144 –    int failTrialCount_;
145 –    int failRootCount_;
146 –    ofstream rnemdLog_;
147 –    int logFrameCount_;
148 –    // James added denLog, vzzLog
149 –    ofstream tempLog_, vxzLog_, vyzLog_, denLog_, vzzLog_, denLog2_;
150 –    ofstream xTempLog_, yTempLog_, zTempLog_, rotTempLog_;
151 –    // keeps track of what's being averaged James added DenHist, pzzHist
152 –    vector<RealType> tempHist_, pxzHist_, pyzHist_, mHist_, DenHist_, pzzHist_, DenHist2_;
153 –    vector<RealType> xTempHist_, yTempHist_, zTempHist_, rotTempHist_;
154 –    // keeps track of the number of degrees of freedom being averaged
155 –    //vector<int> pxzCount_, pyzCount_;
156 –    vector<int> tempCount_, xyzTempCount_, rotTempCount_;
157 –  };
148  
149 +    unsigned int trialCount_;
150 +    unsigned int failTrialCount_;
151 +    unsigned int failRootCount_;
152 +
153 +    string rnemdFileName_;
154 +    ofstream rnemdFile_;
155 +
156 +    RealType runTime_, statusTime_;
157 +
158 +    vector<OutputData> data_;
159 +    OutputBitSet outputMask_;
160 +    OutputMapType outputMap_;
161 +
162 +  };
163   }
164   #endif //INTEGRATORS_RNEMD_HPP

Diff Legend

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