Unverified Commit ef03b63b authored by Peter Doak's avatar Peter Doak Committed by GitHub
Browse files

Merge pull request #190 from gbalduzz/workaround_for_184 

workaround for #184
parents 1e44d172 bcf58678

include/dca/phys/parameters/mc_solver_parameters.hpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class McSolverParameters<solver::CT_AUX> { 
public:

  McSolverParameters()

      : expansion_parameter_K_(1.),

        initial_configuration_size_(10),

        initial_configuration_size_(0),

        initial_matrix_size_(128),

        max_submatrix_size_(128),

        neglect_bennett_updates_(false),

misc/wiki/Parameters.md

+3 −3
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ Used if *CT-AUX* is selected as the cluster solver. 
The perturbation order in the CT-AUX algorithm increases linearly with the expansion parameter *K*.  

While *K* is only subject to the restriction of being positive, values of the order of 1 have proven to be a good choice [3].



`"initial-configuration-size":` integer (10)  

`"initial-configuration-size":` integer (0)  

The CT-AUX solver is initialized with `"initial-configuration-size"` random **interacting** vertices.



`"initial-matrix-size":` integer (128)
@@ -489,7 +489,7 @@ Do additional time measurements. 
    {

        "CT-AUX": {

            "expansion-parameter-K": 1.,

            "initial-configuration-size": 100,

            "initial-configuration-size": 0,

            "initial-matrix-size": 128,



            "max-submatrix-size": 64,
@@ -499,7 +499,7 @@ Do additional time measurements. 
        }

    }



### CT-AUX

### CT-INT



**Group** `"CT-INT":`  

Used if *CT-INT* is selected as the cluster solver.

test/integration/cluster_solver/stdthread_qmci/stdthread_ctaux_tp_test_shared_input.json

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


  "CT-AUX" : {

    "expansion-parameter-K": 5.,

    "initial-configuration-size" : 10,

    "initial-matrix-size": 16,

    "max-submatrix-size": 4

  },

test/unit/phys/parameters/mc_solver_parameters/mc_solver_parameters_ct_aux_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ TEST(McSolverParametersCtAuxTest, DefaultValues) { 
  dca::phys::params::McSolverParameters<dca::phys::solver::CT_AUX> pars;



  EXPECT_EQ(1., pars.get_expansion_parameter_K());

  EXPECT_EQ(10, pars.get_initial_configuration_size());

  EXPECT_EQ(0, pars.get_initial_configuration_size());

  EXPECT_EQ(128, pars.get_initial_matrix_size());

  EXPECT_EQ(128, pars.get_max_submatrix_size());

  EXPECT_FALSE(pars.neglect_bennett_updates());