From ec130dddd54b44923ce98f343e06d5b0ecd3996c Mon Sep 17 00:00:00 2001 From: chortas Date: Sun, 19 Dec 2021 17:04:06 -0300 Subject: [PATCH] Fix bug in gasdev --- fftma_module/gen/include/geostat.h | 2 +- fftma_module/gen/lib_src/generate.c | 2 +- fftma_module/gen/lib_src/geostat.h | 2 +- fftma_module/gen/lib_src/log.c | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fftma_module/gen/include/geostat.h b/fftma_module/gen/include/geostat.h index 9b4b6a7..d47239f 100644 --- a/fftma_module/gen/include/geostat.h +++ b/fftma_module/gen/include/geostat.h @@ -422,7 +422,7 @@ float gammp(float a, float x); /*and unit variance, using ran1(idum) as the source */ /*of uniform deviates */ /*idum: seed */ -double gasdev(long* idum, long* idum2, long* iy, long* iv, int* iset); +double gasdev(long* idum, long* idum2, long* iy, long* iv); /*gaussian covariance value for lag h*/ double gaussian(double h); diff --git a/fftma_module/gen/lib_src/generate.c b/fftma_module/gen/lib_src/generate.c index 416bd57..466a4bb 100644 --- a/fftma_module/gen/lib_src/generate.c +++ b/fftma_module/gen/lib_src/generate.c @@ -49,7 +49,7 @@ void generate(long* seed, int n, struct realization_mod* realization, int cores) /*Gaussian white noise generation*/ for (i = 0; i < n; i++) - (*realization).vector[i] = gasdev(seed, &idum2, &iy, iv, &iset); + (*realization).vector[i] = gasdev(seed, &idum2, &iy, iv); t = clock() - t; double time_taken = ((double)t)/CLOCKS_PER_SEC; // calculate the elapsed time diff --git a/fftma_module/gen/lib_src/geostat.h b/fftma_module/gen/lib_src/geostat.h index 78b121a..fcc0066 100644 --- a/fftma_module/gen/lib_src/geostat.h +++ b/fftma_module/gen/lib_src/geostat.h @@ -423,7 +423,7 @@ float gammp(float a, float x); /*and unit variance, using ran1(idum) as the source */ /*of uniform deviates */ /*idum: seed */ -double gasdev(long* idum, long* idum2, long* iy, long* iv, int* iset); +double gasdev(long* idum, long* idum2, long* iy, long* iv); /*gaussian covariance value for lag h*/ double gaussian(double h); diff --git a/fftma_module/gen/lib_src/log.c b/fftma_module/gen/lib_src/log.c index 0808c51..287ac1f 100644 --- a/fftma_module/gen/lib_src/log.c +++ b/fftma_module/gen/lib_src/log.c @@ -150,8 +150,9 @@ void log_log(int level, const char *file, int line, const char *fmt, ...) { char* env_var = getenv("ENV"); if (env_var != NULL && strcmp("false", env_var) == 0) return; - char* substr = strstr(fmt, "MEM"); - if (env_var != NULL && strcmp("analysis", env_var) == 0 && substr == NULL) return; + char* substr_mem = strstr(fmt, "MEM"); + char* substr_cpu = strstr(fmt, "CPU"); + if (env_var != NULL && strcmp("analysis", env_var) == 0 && substr_mem == NULL && substr_cpu == NULL) return; lock();