fixed the measurements for the voronoi lattice

1 files changed, 4 insertions, 34 deletions

diff --git a/src/measurements.cpp b/src/measurements.cpp
index f2598ee..ffd814d 100644
--- a/src/measurements.cpp
+++ b/src/measurements.cpp
@@ -134,46 +134,16 @@ unsigned edge_r_to_ind(graph::coordinate r, double Lx, double Ly, unsigned Mx, u
 }
 
 ma::ma(unsigned n, double a, unsigned Mx, unsigned My, double beta) :
-  Mx(Mx), My(My), G(2 * n),
-  sc(3 * n, 0),
-  ss(3 * n, 0),
-  sm(3 * n, 0),
-  sa(3 * n, 0),
-  sl(3 * n, 0),
-  sb(3 * n, 0),
-  sD(3 * n, 0),
-  ccc((Mx / 2) * (My / 2), 0),
-  css((Mx / 2) * (My / 2), 0),
-  cmm((Mx / 2) * (My / 2), 0),
-  caa((Mx / 2) * (My / 2), 0),
-  cll((Mx / 2) * (My / 2), 0),
-  cbb((Mx / 2) * (My / 2), 0),
-  cDD((Mx / 2) * (My / 2), 0),
-  csD((Mx / 2) * (My / 2), 0)
+  G(2 * n),
+  sc(2 * n),
+  sm(2 * n),
+  sa(3 * n)
 {
-  N = 0;
-  Nc = 0;
-  Na = 0;
-  Nb = 0;
-
   if (beta != 0.0) {
     model_string = "fracture_" + std::to_string(n) + "_" + std::to_string(a) + "_" + std::to_string(beta) + "_";
   } else {
     model_string = "fracture_" + std::to_string(n) + "_" + std::to_string(a) + "_INF_";
   }
-
-  // FFTW setup for correlation functions
-  /*
-  fftw_set_timelimit(1);
-
-  fftw_forward_in = (double *)fftw_malloc(Mx * My * sizeof(double));
-  fftw_forward_out = (fftw_complex *)fftw_malloc(Mx * My * sizeof(fftw_complex));
-  fftw_reverse_in = (fftw_complex *)fftw_malloc(Mx * My * sizeof(fftw_complex));
-  fftw_reverse_out = (double *)fftw_malloc(Mx * My * sizeof(double));
-
-  forward_plan = fftw_plan_dft_r2c_2d(My, Mx, fftw_forward_in, fftw_forward_out, 0);
-  reverse_plan = fftw_plan_dft_c2r_2d(My, Mx, fftw_reverse_in, fftw_reverse_out, 0);
-  */
 }
 
 ma::ma(unsigned Lx, unsigned Ly, double beta) :