scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #237 from Paul-St-Young/develop 

do not reset 'feedback' parameter
This commit is contained in:
Mark Dewing 2017-05-30 22:39:11 -05:00 committed by GitHub
parent 0fead1219b 10f71ccf3a
commit 558ddf9b63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/QMCDrivers/SimpleFixedNodeBranch.cpp
View File

@ -533,7 +533,7 @@ void SimpleFixedNodeBranch::reset()
{
//logN = Feedback*std::log(static_cast<RealType>(iParam[B_TARGETWALKERS]));
logN = std::log(static_cast<EstimatorRealType>(iParam[B_TARGETWALKERS]));
vParam[B_FEEDBACK]=1.0;
if (vParam[B_FEEDBACK]==0.0) vParam[B_FEEDBACK] = 1.0;
}
else
{
@ -640,7 +640,7 @@ int SimpleFixedNodeBranch::resetRun(xmlNodePtr cur)
if(BranchMode[B_POPCONTROL])
{
vParam[B_ETRIAL]=vParam[B_EREF];
vParam[B_FEEDBACK]=1.0;
if (vParam[B_FEEDBACK]==0.0) vParam[B_FEEDBACK]=1.0;
}
}