Commit b7dce402 authored by gbalduzz's avatar gbalduzz
Browse files

Merge remote-tracking branch 'origin/master' into autocorrelation

parents d5cc2e86 2d2e8e4e

include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_walker.hpp

+4 −6
Original line number Diff line number Diff line
@@ -67,7 +67,10 @@ public: 


  void initialize(int iteration);



  bool is_thermalized() const;

  bool is_thermalized() const {

    return thermalized_;

  }



  void markThermalized();



  // Does one sweep, if the walker is not yet thermalized (warm-up).
@@ -424,11 +427,6 @@ double CtauxWalker<device_t, Parameters, Data, Real>::get_Gflop() { 
  return Gflop;

}



template <dca::linalg::DeviceType device_t, class Parameters, class Data, typename Real>

bool CtauxWalker<device_t, Parameters, Data, Real>::is_thermalized() const {

  return thermalized_;

}



template <dca::linalg::DeviceType device_t, class Parameters, class Data, typename Real>

void CtauxWalker<device_t, Parameters, Data, Real>::markThermalized() {

  thermalized_ = true;

include/dca/phys/dca_step/cluster_solver/ctint/walker/ctint_walker_base.hpp

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ template <class Parameters, typename Real> 
void CtintWalkerBase<Parameters, Real>::initialize(int iteration) {

  assert(total_interaction_);

  sign_ = 1;

  mc_log_weight_ = 1.;

  mc_log_weight_ = 0.;



  sweeps_per_meas_ = parameters_.get_sweeps_per_measurement().at(iteration);

test/integration/cluster_solver/ctint/ctint_double_update_comparison_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ TEST(CtintDoubleUpdateComparisonTest, Self_Energy) { 


  EXPECT_NEAR(walker1.get_MC_log_weight(), walker2.get_MC_log_weight(), 5e-7);



  EXPECT_NEAR(walker1.get_MC_log_weight(), walker2.get_MC_log_weight(), 5e-7);



  for (int i = 0; i < 128; ++i) {

    walker1.doSweep();

    walker2.doSweep();