diff --git a/src/QMCDrivers/WFOpt/ConjugateGradient.cpp b/src/QMCDrivers/WFOpt/ConjugateGradient.cpp index 96b2da0e0e..0530515ed1 100644 --- a/src/QMCDrivers/WFOpt/ConjugateGradient.cpp +++ b/src/QMCDrivers/WFOpt/ConjugateGradient.cpp @@ -17,11 +17,12 @@ namespace qmcplusplus { ConjugateGradient::ConjugateGradient(Real threshold, Real regularization) - : threshold_(threshold), regularization_(regularization) + : threshold_(threshold), regularization_(regularization), conjugate_gradient_timer_(createGlobalTimer("ConjugateGradient::run", timer_level_fine)) {} int ConjugateGradient::run(QMCCostFunctionBase& optTarget, const std::vector& bvec, std::vector& solution) { + ScopedTimer local(conjugate_gradient_timer_); int numParams = optTarget.getNumParams(); int kmax = numParams; int k = 0; diff --git a/src/QMCDrivers/WFOpt/ConjugateGradient.h b/src/QMCDrivers/WFOpt/ConjugateGradient.h index d0abf27e46..767316a2b2 100644 --- a/src/QMCDrivers/WFOpt/ConjugateGradient.h +++ b/src/QMCDrivers/WFOpt/ConjugateGradient.h @@ -14,7 +14,7 @@ #include - +#include namespace qmcplusplus { @@ -41,6 +41,7 @@ class ConjugateGradient //to be used for nonlinear rescale std::vector Axsol_; std::vector xsol_; + NewTimer& conjugate_gradient_timer_; // obtain the range of non-linear parameters void getNonLinearRange(int& first, int& last, const QMCCostFunctionBase& optTarget) const; diff --git a/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp b/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp index fa6b588bf0..e0a9f1a786 100644 --- a/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp +++ b/src/QMCDrivers/WFOpt/QMCCostFunctionBatched.cpp @@ -429,7 +429,6 @@ void QMCCostFunctionBatched::checkConfigurations(EngineHandle& handle) void QMCCostFunctionBatched::checkConfigurationsSR(EngineHandle& handle) { - std::cout << "checkConfigurationsSR" << std::endl; ScopedTimer tmp_timer(check_config_timer_); RealType et_tot = 0.0;