From ffa58d427cd0e8b4e6ebd5538a83bec63a85ab27 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 19 Jul 2018 13:39:01 -0400 Subject: new mesaurement flag system, fftw only initialized once, all O(n) models now built from one file with different compiler flag settings --- lib/correlation.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'lib/correlation.h') diff --git a/lib/correlation.h b/lib/correlation.h index 5722aab..b3b7d86 100644 --- a/lib/correlation.h +++ b/lib/correlation.h @@ -7,29 +7,14 @@ #include template -double correlation_length(const state_t *s) { - double *data = (double *)fftw_malloc(s->nv * sizeof(double)); - int rank = s->D; - int *n = (int *)malloc(rank * sizeof(int)); - fftw_r2r_kind *kind = (fftw_r2r_kind *)malloc(rank * sizeof(fftw_r2r_kind)); - for (D_t i = 0; i < rank; i++) { - n[i] = s->L; - kind[i] = FFTW_R2HC; - } - fftw_plan plan = fftw_plan_r2r(rank, n, data, data, kind, 0); - +double correlation_length(const state_t *s, fftw_plan plan, double *in, double *out) { for (v_t i = 0; i < s->nv; i++) { - data[i] = correlation_component(s->spins[i]); + in[i] = correlation_component(s->spins[i]); } fftw_execute(plan); - double length = pow(data[0], 2); - - fftw_destroy_plan(plan); - fftw_free(data); - free(n); - free(kind); + double length = pow(out[0], 2); return length; } -- cgit v1.2.3-70-g09d2