Skip to content

Commit

Permalink
Rename option value from legacy to unlimited_history.
Browse files Browse the repository at this point in the history
  • Loading branch information
ye-luo committed Mar 8, 2023
1 parent 718a530 commit 1ed62ef
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/QMCDrivers/DMC/DMCBatched.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void DMCBatched::process(xmlNodePtr node)
app_log() << " Creating the branching engine and walker controler" << std::endl;
const auto refE_update_scheme = dmcdriver_input_.get_refenergy_update_scheme();
app_log() << " Reference energy is updated using the "
<< (refE_update_scheme == DMCRefEnergyScheme::LEGACY ? "legacy" : "history limited") << " scheme"
<< (refE_update_scheme == DMCRefEnergyScheme::UNLIMITED_HISTORY ? "unlimited_history" : "limited_history") << " scheme"
<< std::endl;
branch_engine_ =
std::make_unique<SFNBranch>(qmcdriver_input_.get_tau(), dmcdriver_input_.get_feedback(), refE_update_scheme);
Expand Down
6 changes: 3 additions & 3 deletions src/QMCDrivers/DMC/DMCDriverInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void DMCDriverInput::readXML(xmlNodePtr node)
parameter_set_.add(NonLocalMove, "nonlocalmoves", {"no", "yes", "v0", "v1", "v3"});
parameter_set_.add(max_age_, "MaxAge");
parameter_set_.add(feedback_, "feedback");
parameter_set_.add(refE_update_scheme_str, "refenergy_update_scheme", {"legacy", "limited_history"});
parameter_set_.add(refE_update_scheme_str, "refenergy_update_scheme", {"unlimited_history", "limited_history"});

// from DMC.cpp put(xmlNodePtr)
parameter_set_.add(branch_interval_, "branchInterval");
Expand Down Expand Up @@ -68,8 +68,8 @@ void DMCDriverInput::readXML(xmlNodePtr node)
if (reserve_ < 1.0)
throw std::runtime_error("You can only reserve walkers above the target walker count");

if (refE_update_scheme_str == "legacy")
refenergy_update_scheme_ = DMCRefEnergyScheme::LEGACY;
if (refE_update_scheme_str == "unlimited_history")
refenergy_update_scheme_ = DMCRefEnergyScheme::UNLIMITED_HISTORY;
else
refenergy_update_scheme_ = DMCRefEnergyScheme::LIMITED_HISTORY;
}
Expand Down
2 changes: 1 addition & 1 deletion src/QMCDrivers/DMC/DMCRefEnergyScheme.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace qmcplusplus
*/
enum class DMCRefEnergyScheme
{
LEGACY,
UNLIMITED_HISTORY,
LIMITED_HISTORY
};
} // namespace qmcplusplus
Expand Down

0 comments on commit 1ed62ef

Please sign in to comment.