Reweighting branch merge

.gitignore

@@ -18,5 +18,6 @@ tags
 hmc_tm
 invert
 offline_measurement
+measure
 lib/
 benchmark

DDalphaAMG_interface.c

@@ -533,6 +533,25 @@ void MG_update_mu(double mu_tmLQCD, double odd_tmLQCD)
   }	 
 }
 
+/*
+ * This extra interface has been required for the reweighting measurements.
+ * The update of the parameters was not taken into account properly.
+ */
+void MG_update_kappa(double kappa)
+{
+  if(mg_initialized!=1){
+      return;
+  }
+  DDalphaAMG_get_parameters(&mg_params);
+  if (kappa!= mg_params.kappa) {
+    if (g_proc_id == 0) {
+       printf("MG WARNING: setting kappa from %.14f to %.14f general kappa %.14f\n",mg_params.kappa,kappa,g_kappa);
+       }
+    mg_params.kappa=kappa;
+    DDalphaAMG_update_parameters(&mg_params, &mg_status);
+ }
+}
+
 void MG_reset() {
 
   if(mg_do_setup == 0)

DDalphaAMG_interface.h

@@ -44,6 +44,7 @@ extern double mg_rho_update;
 void MG_init(void);
 void MG_update_gauge(double step);
 void MG_update_mu(double mu_tmLQCD, double odd_tmLQCD);
+void MG_update_kappa(double kappa);
 void MG_reset(void);
 void MG_finalize(void);
 

Makefile.in

@@ -124,7 +124,7 @@ ${addsuffix .o, ${SMODULES}}: %.o: ${srcdir}/%.c %.d Makefile $(abs_top_builddir
 # C++ modules
 $(addsuffix .o,${CXXMODULES}): %.o: ${srcdir}/%.cpp %.d Makefile $(abs_top_builddir)/config.h
 	${CXXCOMPILE} -c $<
-	
+
 ${addsuffix .o, ${PROGRAMS}}: %.o: ${srcdir}/%.c %.d Makefile $(abs_top_builddir)/config.h ${top_srcdir}/git_hash.h
 	${COMPILE} ${OPTARGS} -c $<
 

meas/Makefile.in

@@ -34,6 +34,7 @@ LIBRARIES = libmeas
 libmeas_TARGETS = measurements \
 	oriented_plaquettes \
 	correlators \
+	reweightingmeas \
 	pion_norm \
 	polyakov_loop \
 	measure_clover_field_strength_observables \

meas/measurements.c

@@ -2,6 +2,7 @@
  *  
  * Copyright (C) 2008 Carsten Urbach
  *               2009 Florian Burger
+ *               2016 Georg Bergner
  *
  * This file is part of tmLQCD.
  *
@@ -35,8 +36,10 @@
 #include "polyakov_loop.h"
 #include "oriented_plaquettes.h"
 #include "gradient_flow.h"
+#include "reweightingmeas.h"
 #include "measurements.h"
 
+
 measurement measurement_list[max_no_measurements];
 int no_measurements = 0;
 
@@ -49,6 +52,8 @@ int add_measurement(const enum MEAS_TYPE meas_type) {
   measurement_list[no_measurements].measurefunc = &dummy_meas;
   measurement_list[no_measurements].type = meas_type;
   measurement_list[no_measurements].initialised = 1;
+  measurement_list[no_measurements].parameter=(void *)NULL;
+	measurement_list[no_measurements].destructor = &default_destructor;
   no_measurements++;
   return(no_measurements);
 }
@@ -80,6 +85,12 @@ int init_measurements(){
       measurement_list[i].measurefunc = &gradient_flow_measurement;
     }
 
+    if(measurement_list[i].type == REWEIGHTING) {
+      measurement_list[i].measurefunc = &reweighting_measurement;
+      initialize_reweighting_parameter(&measurement_list[i].parameter);
+			measurement_list[i].destructor = &free_reweighting_parameter;
+    }
+
     measurement_list[i].id = i;
  }
 return(0);
@@ -88,7 +99,14 @@ return(0);
 
 
 void free_measurements(){
-
+	int i;
+	for(i = 0; i < no_measurements; i++) {
+		if (measurement_list[i].parameter) {
+			measurement_list[i].destructor(measurement_list[i].parameter);
+			free(measurement_list[i].parameter);
+			measurement_list[i].parameter = NULL;
+		}
+	}
  return;
 }
 
@@ -102,5 +120,10 @@ void dummy_meas(const int traj, const int id, const int ieo) {
 }
 
 
+void default_destructor(void* ptr) {
+
+}
+
+
 
 

meas/measurements.h

@@ -4,6 +4,8 @@
  *
  * Adapted from monomial.h by Florian Burger 2009/12/16
  *
+ * More flexible handling of measurements parameters by Georg Bergner 2016
+ *
  * This file is part of tmLQCD.
  *
  * tmLQCD is free software: you can redistribute it and/or modify
@@ -18,36 +20,41 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *
  ***********************************************************************/
 #ifndef _MEASUREMENTS_H
 #define _MEASUREMENTS_H
 
 #define max_no_measurements 20
 
 /* Give the measurement types an unambiguous ID*/
-enum MEAS_TYPE { 
-  ONLINE, 
-  PIONNORM, 
-  POLYAKOV, 
-  ORIENTED_PLAQUETTES,
-  GRADIENT_FLOW 
-  };
-
-typedef struct {
+enum MEAS_TYPE
+{
+  ONLINE, PIONNORM, POLYAKOV, ORIENTED_PLAQUETTES, GRADIENT_FLOW, REWEIGHTING
+};
+
+typedef struct
+{
   enum MEAS_TYPE type;
   int initialised;
   int id;
-
-  /* frequency of the measurement */
-  int freq;
-  /* for maximal iterations in inversions for correlators */
-  int max_iter;
+
   /* for polyakov loop */
   int direction;
 
+  /* for maximal iterations in inversions for correlators */
+  int max_iter;
+
   // random seed
   unsigned int seed;
 
+  void* parameter;
+
+  /* frequency of the measurement */
+  int freq;
+
   /* how it's usually called */
   char name[100];
 
@@ -67,21 +74,29 @@ typedef struct {
   double gf_tmax;
 
   /* functions for the measurement */
-  void (*measurefunc) (const int traj, const int id, const int ieo);
+  void
+  (*measurefunc) (const int traj, const int id, const int ieo);
+  void
+  (*destructor) (void* param);
 } measurement;
 
-
 /* list of all monomials */
 extern measurement measurement_list[max_no_measurements];
 extern int no_measurements;
 
 /* add a new measurement to the list of measurements */
-int add_measurement(const enum MEAS_TYPE);
+int
+add_measurement (const enum MEAS_TYPE);
 /* initialise all measurements in the list */
-int init_measurements();
+int
+init_measurements ();
 /* free space again */
-void free_measurements();
+void
+free_measurements ();
 
-void dummy_meas(const int traj, const int id, const int ieo);
+void
+dummy_meas (const int traj, const int id, const int ieo);
+void
+default_destructor (void* ptr);
 
 #endif