Revert "I am adding a functionality to the HMC. For the CLOVERDETRATI…

…O monomial, it's now possible to specify a solver for the heatbath, different from the one used in the MD evolution (computation of the forces)." This reverts commit 583f2ee.
etmc · Jul 6, 2022 · da55dc9 · da55dc9
1 parent 583f2ee
commit da55dc9
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,6 @@ config.status
 *.mod.c
 *.opari.inc
 build/*
-build*
 tags
 *.a
 hmc_tm

diff --git a/default_input_values.h b/default_input_values.h
@@ -85,7 +85,6 @@
 #define _default_rlxd_level 1
 #define _default_solver_flag 1 // this is CG (see solver/solver_types.h)
 #define _default_nd_solver_flag 15 // this is CGMMSND (see solver/solver_types.h)
-#define _default_HB_solver_flag 26 // this is INVALID_SOLVER (see solver/solver_types.h)
 #define _default_startoption 0
 #define _default_Ntherm 0
 #define _default_Nmeas 1

diff --git a/monomial/cloverdetratio_monomial.c b/monomial/cloverdetratio_monomial.c
@@ -283,15 +283,15 @@ void cloverdetratio_heatbath(const int id, hamiltonian_field_t * const hf) {
   zero_spinor_field(mnl->pf,VOLUME/2);
   tm_stopwatch_pop(&g_timers, 0, 1, ""); 
 
-  if( mnl->HB_solver == MG ){
-      mnl->iter0 = solve_degenerate(mnl->pf, mnl->w_fields[1], mnl->HB_solver_params, mnl->maxiter, mnl->accprec,  
-				    g_relative_precision_flag, VOLUME/2, mnl->Qp, mnl->HB_solver); 
+  if( mnl->solver == MG ){
+      mnl->iter0 = solve_degenerate(mnl->pf, mnl->w_fields[1], mnl->solver_params, mnl->maxiter, mnl->accprec,  
+				    g_relative_precision_flag, VOLUME/2, mnl->Qp, mnl->solver); 
 
       chrono_add_solution(mnl->pf, mnl->csg_field, mnl->csg_index_array,
 			  mnl->csg_N, &mnl->csg_n, VOLUME/2);
   } else {
-      mnl->iter0 = solve_degenerate(mnl->pf, mnl->w_fields[1], mnl->HB_solver_params, mnl->maxiter, mnl->accprec,  
-				    g_relative_precision_flag, VOLUME/2, mnl->Qsq, mnl->HB_solver); 
+      mnl->iter0 = solve_degenerate(mnl->pf, mnl->w_fields[1], mnl->solver_params, mnl->maxiter, mnl->accprec,  
+				    g_relative_precision_flag, VOLUME/2, mnl->Qsq, mnl->solver); 
 
       chrono_add_solution(mnl->pf, mnl->csg_field, mnl->csg_index_array,
 			  mnl->csg_N, &mnl->csg_n, VOLUME/2);

diff --git a/monomial/monomial.c b/monomial/monomial.c
@@ -103,7 +103,6 @@ int add_monomial(const int type) {
   }
   else{
     monomial_list[no_monomials].solver = _default_solver_flag;
-    monomial_list[no_monomials].HB_solver = _default_HB_solver_flag;
   }
   monomial_list[no_monomials].solver_params.mcg_delta = _default_mixcg_innereps;
   monomial_list[no_monomials].solver_params.solution_type = TM_SOLUTION_M_MDAG;
@@ -249,11 +248,6 @@ int init_monomials(const int V, const int even_odd_flag) {
         }
       }
       else if(monomial_list[i].type == CLOVERDETRATIO) {
-        if (monomial_list[i].HB_solver == _default_HB_solver_flag) {
-          monomial_list[i].HB_solver = monomial_list[i].solver;
-          monomial_list[i].HB_solver_params = monomial_list[i].solver_params;
-        }
-
         monomial_list[i].hbfunction = &cloverdetratio_heatbath;
         monomial_list[i].accfunction = &cloverdetratio_acc;
         monomial_list[i].derivativefunction = &cloverdetratio_derivative;

diff --git a/monomial/monomial.h b/monomial/monomial.h
@@ -66,7 +66,6 @@ typedef struct {
   int even_odd_flag;
   int rngrepro;
   int solver;
-  int HB_solver; // solver for the HB only (optional)
 
   int iter0, iter1, iter2;
   int csg_N, csg_N2;
@@ -91,7 +90,6 @@ typedef struct {
   double forceprec;
   double accprec;
   solver_params_t solver_params;
-  solver_params_t HB_solver_params; // parameters of the HB solver
   /* force normalisation */
   double forcefactor;
   /* some book-keeping */

diff --git a/read_input.l b/read_input.l
@@ -615,7 +615,6 @@ static inline double fltlist_next_token(int * const list_end){
 %x MNAME
 %x MCSTR
 %x MSOLVER
-%x HB_MSOLVER
 %x RATMSOLVER
 %x NDMSOLVER
 %x GTYPE
@@ -2447,10 +2446,6 @@ static inline double fltlist_next_token(int * const list_end){
    solver_caller=YY_START;
    BEGIN(NDMSOLVER);
   }
-  {SPC}*HB_Solver{EQL} {
-   solver_caller=YY_START;
-   BEGIN(NDMSOLVER);
-  }
 }
 
 <RATMONOMIAL,RATCORMONOMIAL,CLRATMONOMIAL,CLRATCORMONOMIAL>{
@@ -2481,10 +2476,6 @@ static inline double fltlist_next_token(int * const list_end){
    solver_caller=YY_START;
    BEGIN(MSOLVER);
   }
-  {SPC}*HB_Solver{EQL} {
-   solver_caller=YY_START;
-   BEGIN(HB_MSOLVER);
-  }
 }
 
 <GAUGEMONOMIAL>{
@@ -2726,51 +2717,6 @@ static inline double fltlist_next_token(int * const list_end){
   }
 }
 
-<HB_MSOLVER>{
-  CG {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver = CG;
-    BEGIN(solver_caller);
-  }
-  mixedCG {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver = MIXEDCG;
-    BEGIN(solver_caller);
-  }
-  rgmixedCG {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver = RGMIXEDCG;
-    BEGIN(solver_caller);
-  }
-  BICGSTAB {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver = BICGSTAB;
-    BEGIN(solver_caller);
-  }
-  mixedbicgstab {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver=MIXEDBICGSTAB;
-    BEGIN(name_caller);
-  }
-  MG {
-    if(myverbose) printf("  HB Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);
-    mnl->HB_solver = MG;
-    BEGIN(name_caller);
-  }
-  DDalphaAMG {
-#ifdef DDalphaAMG
-    if(myverbose) printf("  HB Solver set to DDalphaAMG line %d operator %d\n", line_of_file, current_operator);
-    mnl->HB_solver = MG;
-    BEGIN(solver_caller);
-#else
-    printf("ERROR line %d operator %d: DDalphaAMG library not included\n", line_of_file, current_operator);
-    exit(1);
-#endif
-  }
-}
-
-
-
 <RATMSOLVER>{
   rgmixedCG {
     if(myverbose) printf("  Solver set to \"%s\" line %d monomial %d\n", yytext, line_of_file, current_monomial);

diff --git a/solver/solver_types.h b/solver/solver_types.h
@@ -47,8 +47,7 @@ typedef enum SOLVER_TYPE {
  MG,
  MIXEDBICGSTAB,
  DUMMYHERMTEST,
- CA_GCR,
- INVALID_SOLVER
+ CA_GCR
 } SOLVER_TYPE;
 
 int solver_is_mixed( const int solver_type );