From ff660a1faa844c909b012b033701bb568bd37ad9 Mon Sep 17 00:00:00 2001 From: Jeongnim Kim Date: Thu, 21 Feb 2013 00:37:54 +0000 Subject: [PATCH] Add coefs_size to UBspline_3d_x. git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@5728 e5b18d87-469d-4833-9cc0-8cdfa06e9491 --- src/einspline/bspline_create.c | 13 +++++++------ src/einspline/bspline_structs.h | 3 +++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/einspline/bspline_create.c b/src/einspline/bspline_create.c index 204176ed1..8e7baeaea 100644 --- a/src/einspline/bspline_create.c +++ b/src/einspline/bspline_create.c @@ -492,12 +492,11 @@ create_UBspline_3d_s (Ugrid x_grid, Ugrid y_grid, Ugrid z_grid, spline->x_stride = Ny*Nz; spline->y_stride = Nz; - - size_t Nxyz=(size_t)Nx*(size_t)Ny*(size_t)Nz; + spline->coefs_size=(size_t)Nx*(size_t)Ny*(size_t)Nz; #ifndef HAVE_SSE2 - spline->coefs = malloc (sizeof(float)*Nxyz); + spline->coefs = malloc (sizeof(float)*spline->coefs_size); #else - posix_memalign ((void**)&spline->coefs, 16, (sizeof(float)*Nxyz)); + posix_memalign ((void**)&spline->coefs, 16, (sizeof(float)*spline->coefs_size)); #endif // First, solve in the X-direction @@ -1372,10 +1371,12 @@ create_UBspline_3d_d (Ugrid x_grid, Ugrid y_grid, Ugrid z_grid, spline->x_stride = Ny*Nz; spline->y_stride = Nz; + spline->coefs_size=(size_t)Nx*(size_t)Ny*(size_t)Nz; + #ifndef HAVE_SSE2 - spline->coefs = malloc (sizeof(double)*Nx*Ny*Nz); + spline->coefs = malloc (sizeof(double)*spline->coefs_size); #else - posix_memalign ((void**)&spline->coefs, 16, (sizeof(double)*Nx*Ny*Nz)); + posix_memalign ((void**)&spline->coefs, 16, (sizeof(double)*spline->coefs_size)); #endif if(data != NULL) // only data is provided diff --git a/src/einspline/bspline_structs.h b/src/einspline/bspline_structs.h index bd61f72f6..b45166ac0 100644 --- a/src/einspline/bspline_structs.h +++ b/src/einspline/bspline_structs.h @@ -20,6 +20,7 @@ #ifndef BSPLINE_STRUCTS_STD_H #define BSPLINE_STRUCTS_STD_H +#include /////////////////////////// // Single precision real // @@ -51,6 +52,7 @@ typedef struct int x_stride, y_stride; Ugrid x_grid, y_grid, z_grid; BCtype_s xBC, yBC, zBC; + size_t coefs_size; } UBspline_3d_s; @@ -84,6 +86,7 @@ typedef struct int x_stride, y_stride; Ugrid x_grid, y_grid, z_grid; BCtype_d xBC, yBC, zBC; + size_t coefs_size; } UBspline_3d_d;