removed also g_update_rectangle_energy

Marcogarofalo · Feb 13, 2013 · c27ae34 · c27ae34
1 parent 2acd272
commit c27ae34
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 76 deletions.
diff --git a/GPU/mixed_solve.cu b/GPU/mixed_solve.cu
@@ -2372,7 +2372,6 @@ MixedsolveParameter<RealT>* init_mixedsolve_eo(su3** gf){
   float hostplaq;
   int a = 0;
   //for(count=0; count<1; count++){
-    g_update_gauge_energy = 1;
     hostplaq = (float) measure_gauge_action()/(6.*VOLUME*g_nproc);
   //}
   assert((stop = clock())!=-1);
@@ -2393,7 +2392,6 @@ MixedsolveParameter<RealT>* init_mixedsolve_eo(su3** gf){
   float hostrect;
   assert((start = clock())!=-1);
   //for(count=0; count<100; count++){
-    g_update_rectangle_energy = 1;
     hostrect = (float) measure_rectangles()/(12.*VOLUME*g_nproc);
   //}
   assert((stop = clock())!=-1);

diff --git a/check_locallity.c b/check_locallity.c
@@ -249,7 +249,6 @@ int main(int argc,char *argv[]) {
       if (stout_smear((su3_tuple*)(g_gauge_field[0]), &params_smear, (su3_tuple*)(g_gauge_field[0])) != 0)
         exit(1) ;
       g_update_gauge_copy = 1;
-      g_update_rectangle_energy = 1;
       plaquette_energy = measure_plaquette(g_gauge_field);
 
       if (g_proc_id == 0) {

diff --git a/global.h b/global.h
@@ -70,7 +70,6 @@ EXTERN int DUM_BI_DERI, DUM_BI_SOLVER, DUM_BI_MATRIX;
 EXTERN int NO_OF_BISPINORFIELDS;
 
 EXTERN int g_update_gauge_copy;
-EXTERN int g_update_rectangle_energy;
 EXTERN int g_relative_precision_flag;
 EXTERN int g_debug_level;
 EXTERN int g_disable_IO_checks;

diff --git a/hamiltonian_field.h b/hamiltonian_field.h
@@ -30,7 +30,6 @@ typedef struct {
   su3adj ** momenta;
   su3adj ** derivative;
   int update_gauge_copy;
-  int update_rectangle_energy;
   int traj_counter;
 } hamiltonian_field_t;
 

diff --git a/init/init_gauge_field.c b/init/init_gauge_field.c
@@ -156,7 +156,6 @@ int init_gauge_field(const int V, const int back) {
   }
 #  endif
   g_update_gauge_copy = 1;
-  g_update_rectangle_energy = 1;
   return(0);
 }
 

diff --git a/integrator.c b/integrator.c
@@ -96,7 +96,6 @@ void integrator_set_fields(hamiltonian_field_t * hf) {
   Integrator.hf.momenta = hf->momenta;
   Integrator.hf.derivative = hf->derivative;
   Integrator.hf.update_gauge_copy = hf->update_gauge_copy;
-  Integrator.hf.update_rectangle_energy = hf->update_rectangle_energy;
   return;
 }
 

diff --git a/invert.c b/invert.c
@@ -356,7 +356,6 @@ int main(int argc, char *argv[])
 /*       if (stout_smear((su3_tuple*)(g_gauge_field[0]), &params_smear, (su3_tuple*)(g_gauge_field[0])) != 0) */
 /*         exit(1) ; */
       g_update_gauge_copy = 1;
-      g_update_rectangle_energy = 1;
       plaquette_energy = measure_plaquette( (const su3**) g_gauge_field);
 
       if (g_cart_id == 0) {

diff --git a/measure_rectangles.c b/measure_rectangles.c
@@ -65,82 +65,76 @@ double measure_rectangles(const su3 ** const gf) {
   const su3 *v = NULL , *w = NULL;
   double ALIGN ac, ks, kc, tr, ts, tt;
 
-  if(g_update_rectangle_energy) {
-    kc = 0.0;
-    ks = 0.0;
+  kc = 0.0;
+  ks = 0.0;
 #ifdef OMP
 #pragma omp for
 #endif
-    for (i = 0; i < VOLUME; i++) {
-      for (mu = 0; mu < 4; mu++) {
-	for (nu = 0; nu < 4; nu++) { 
-	  if(nu != mu) {
-	    /*
-	      ^
-	      |
-	      ^
-	      |
-	      ->
-	    */
-	    j = g_iup[i][mu];
-	    k = g_iup[j][nu];
-	    v = &gf[i][mu];
-	    w = &gf[j][nu];
-	    _su3_times_su3(tmp, *v, *w);
-	    v = &gf[k][nu];
-	    _su3_times_su3(pr1, tmp, *v);
-	    /*
-	      ->
-	      ^
-	      |
-	      ^
-	      |
-	    */
-	    j = g_iup[i][nu];
-	    k = g_iup[j][nu];
-	    v = &gf[i][nu];
-	    w = &gf[j][nu];
-	    _su3_times_su3(tmp, *v, *w);
-	    v = &gf[k][mu];
-	    _su3_times_su3(pr2, tmp, *v);
-
-	    /* Trace it */
-	    _trace_su3_times_su3d(ac,pr1,pr2);
-	    /* 	  printf("i mu nu: %d %d %d, ac = %e\n", i, mu, nu, ac); */
-	    /* Kahan summation */
-	    tr=ac+kc;
-	    ts=tr+ks;
-	    tt=ts-ks;
-	    ks=ts;
-	    kc=tr-tt;
-	  }
+  for (i = 0; i < VOLUME; i++) {
+    for (mu = 0; mu < 4; mu++) {
+      for (nu = 0; nu < 4; nu++) { 
+	if(nu != mu) {
+	  /*
+	    ^
+	    |
+	    ^
+	    |
+	    ->
+	  */
+	  j = g_iup[i][mu];
+	  k = g_iup[j][nu];
+	  v = &gf[i][mu];
+	  w = &gf[j][nu];
+	  _su3_times_su3(tmp, *v, *w);
+	  v = &gf[k][nu];
+	  _su3_times_su3(pr1, tmp, *v);
+	  /*
+	    ->
+	    ^
+	    |
+	    ^
+	    |
+	  */
+	  j = g_iup[i][nu];
+	  k = g_iup[j][nu];
+	  v = &gf[i][nu];
+	  w = &gf[j][nu];
+	  _su3_times_su3(tmp, *v, *w);
+	  v = &gf[k][mu];
+	  _su3_times_su3(pr2, tmp, *v);
+
+	  /* Trace it */
+	  _trace_su3_times_su3d(ac,pr1,pr2);
+	  /* 	  printf("i mu nu: %d %d %d, ac = %e\n", i, mu, nu, ac); */
+	  /* Kahan summation */
+	  tr=ac+kc;
+	  ts=tr+ks;
+	  tt=ts-ks;
+	  ks=ts;
+	  kc=tr-tt;
 	}
       }
     }
-    kc=(kc+ks)/3.0;
+  }
+  kc=(kc+ks)/3.0;
 #ifdef OMP
-    g_omp_acc_re[thread_num] = kc;
+  g_omp_acc_re[thread_num] = kc;
 #else
-    res = kc;
+  res = kc;
 #endif
-  }
 
 #ifdef OMP
   } /* OpenMP parallel closing brace */
 
-  if(g_update_rectangle_energy) {
-    res = 0.0;
-    for(int i = 0; i < omp_num_threads; ++i)
-      res += g_omp_acc_re[i];
+  res = 0.0;
+  for(int i = 0; i < omp_num_threads; ++i)
+    res += g_omp_acc_re[i];
 #else
-  if(g_update_rectangle_energy) {
 #endif
 #ifdef MPI
-    MPI_Allreduce(&res, &mres, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-    res = mres;
+  MPI_Allreduce(&res, &mres, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
+  res = mres;
 #endif
-    g_update_rectangle_energy = 0;
-  }
 
   return res;
 }
diff --git a/reweighting_factor.c b/reweighting_factor.c
@@ -43,7 +43,6 @@ void reweighting_factor(const int N, const int nstore) {
   hf.momenta = NULL;
   hf.derivative = NULL;
   hf.update_gauge_copy = g_update_gauge_copy;
-  hf.update_rectangle_energy = g_update_rectangle_energy;
 
   sum = (double*)calloc(no_monomials, sizeof(double));
   sum_sq = (double*)calloc(no_monomials, sizeof(double));

diff --git a/start.c b/start.c
@@ -420,7 +420,6 @@ void unit_g_gauge_field(void)
     }
   }
   g_update_gauge_copy = 1;
-  g_update_rectangle_energy = 1;
   return;
 }
 
@@ -489,7 +488,6 @@ void random_gauge_field(const int repro, su3 ** const gf) {
   }
 
   g_update_gauge_copy = 1;
-  g_update_rectangle_energy = 1;
   return;
 }
 
@@ -686,7 +684,6 @@ void set_gauge_field(const double c)
     }
   }
   g_update_gauge_copy = 1;
-  g_update_rectangle_energy = 1;
   return;
 }
 

diff --git a/update_gauge.c b/update_gauge.c
@@ -98,8 +98,6 @@ void update_gauge(const double step, hamiltonian_field_t * const hf) {
    */
   hf->update_gauge_copy = 1;
   g_update_gauge_copy = 1;
-  hf->update_rectangle_energy = 1;
-  g_update_rectangle_energy = 1;
   etime = gettime();
   if(g_debug_level > 1 && g_proc_id == 0) {
     printf("# Time gauge update: %e s\n", etime-atime); 

diff --git a/update_tm.c b/update_tm.c
@@ -93,7 +93,6 @@ int update_tm(double *plaquette_energy, double *rectangle_energy,
   hf.momenta = moment;
   hf.derivative = df0;
   hf.update_gauge_copy = g_update_gauge_copy;
-  hf.update_rectangle_energy = g_update_rectangle_energy;
   hf.traj_counter = traj_counter;
   integrator_set_fields(&hf);
 
@@ -345,8 +344,6 @@ int update_tm(double *plaquette_energy, double *rectangle_energy,
   }
   hf.update_gauge_copy = 1;
   g_update_gauge_copy = 1;
-  hf.update_rectangle_energy = 1;
-  g_update_rectangle_energy = 1;
 #ifdef MPI
   xchange_gauge(hf.gaugefield);
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,6 @@ int init_gauge_field(const int V, const int back) { @@
       }
     #  endif
       g_update_gauge_copy = 1;
-      g_update_rectangle_energy = 1;
       return(0);
     }
@@ Expand Down @@