55 |
|
#include "selection/SelectionManager.hpp" |
56 |
|
#include <iostream> |
57 |
|
|
58 |
+ |
using namespace std; |
59 |
|
namespace OpenMD { |
60 |
|
|
61 |
|
/** |
77 |
|
exchangeTime_ = exchangeTime; |
78 |
|
} |
79 |
|
void set_RNEMD_nBins(int nbins) { nBins_ = nbins; } |
80 |
< |
RealType get_RNEMD_exchange_total() { return exchangeSum_; } |
80 |
> |
void set_RNEMD_logWidth(int logWidth) { rnemdLogWidth_ = logWidth; } |
81 |
|
void set_RNEMD_exchange_total(RealType et) { exchangeSum_ = et; } |
82 |
|
void set_RNEMD_target_flux(RealType targetFlux) {targetFlux_ = targetFlux;} |
83 |
+ |
RealType get_RNEMD_exchange_total() { return exchangeSum_; } |
84 |
|
|
85 |
|
private: |
86 |
|
|
98 |
|
|
99 |
|
SimInfo* info_; |
100 |
|
RandNumGen* randNumGen_; |
101 |
< |
std::map<std::string, RNEMDTypeEnum> stringToEnumMap_; |
101 |
> |
map<string, RNEMDTypeEnum> stringToEnumMap_; |
102 |
|
RNEMDTypeEnum rnemdType_; |
103 |
< |
std::string rnemdObjectSelection_; |
103 |
> |
string rnemdObjectSelection_; |
104 |
|
SelectionEvaluator evaluator_; |
105 |
|
SelectionManager seleMan_; |
106 |
|
bool usePeriodicBoundaryConditions_; |
107 |
< |
int nBins_; |
107 |
> |
bool output3DTemp_; |
108 |
> |
int nBins_; /**< The number of bins to divide the simulation box into. */ |
109 |
> |
/*! |
110 |
> |
The middle bin for the RNEMD method. midBin_ = nBins_/2; |
111 |
> |
Depending on the setting of the flux, this box should contain the minimum energy (temperature) |
112 |
> |
within the simulation. |
113 |
> |
*/ |
114 |
|
int midBin_; |
115 |
< |
int rnemdLogWidth_; |
115 |
> |
int rnemdLogWidth_; /**< Number of elements to print out in logs */ |
116 |
> |
RealType zShift_; |
117 |
|
RealType exchangeTime_; |
118 |
|
RealType targetFlux_; |
119 |
|
RealType exchangeSum_; |
120 |
|
int failTrialCount_; |
121 |
|
int failRootCount_; |
122 |
< |
std::ofstream rnemdLog_; |
122 |
> |
ofstream rnemdLog_; |
123 |
|
// keeps track of what's being averaged |
124 |
< |
std::vector<RealType> valueHist_; |
125 |
< |
std::vector<int> valueCount_; |
124 |
> |
vector<RealType> valueHist_; |
125 |
> |
vector<int> valueCount_, xyzTempCount_; |
126 |
|
// keeps track of the number of degrees of freedom being averaged |
127 |
< |
std::vector<RealType> xTempHist_, yTempHist_, zTempHist_; |
128 |
< |
std::ofstream xTempLog_, yTempLog_, zTempLog_; |
127 |
> |
vector<RealType> xTempHist_, yTempHist_, zTempHist_; |
128 |
> |
ofstream xTempLog_, yTempLog_, zTempLog_; |
129 |
|
}; |
130 |
|
|
131 |
|
} |