User: rhaas Date: 2014/03/12 10:01 PM

Modified: /trunk/src/nuc_eos_cxx/ helpers.hh, nuc_eos.hh

Log: EOS_Omni: remove __restrict__ in favor of restrict since Cactus handles

restrict for us.

From: Roland Haas rhaas@tapir.caltech.edu

File Changes:

Directory: /trunk/src/nuc_eos_cxx/ ==================================

File [modified]: helpers.hh Delta lines: +19 -18 =================================================================== --- trunk/src/nuc_eos_cxx/helpers.hh 2014-03-13 03:01:30 UTC (rev 94) +++ trunk/src/nuc_eos_cxx/helpers.hh 2014-03-13 03:01:36 UTC (rev 95) @@ -28,6 +28,7 @@ return 101; } if(xye < eos_yemin) { + // this is probably not pure and should be removed fprintf(stderr,"xye: %15.6E eos_yemin: %15.6E\n",xye,eos_yemin); return 102; } @@ -72,10 +73,10 @@ void get_interp_spots(const double x, const double y, const double z, - double* __restrict__ delx, - double* __restrict__ dely, - double* __restrict__ delz, - int* __restrict__ idx) + double* restrict delx, + double* restrict dely, + double* restrict delz, + int* restrict idx) { using namespace nuc_eos;

@@ -108,10 +109,10 @@ void get_interp_spots_linT_low(const double x, const double y, const double z, - double* __restrict__ delx, - double* __restrict__ dely, - double* __restrict__ delz, - int* __restrict__ idx) + double* restrict delx, + double* restrict dely, + double* restrict delz, + int* restrict idx) { using namespace nuc_eos;

@@ -143,10 +144,10 @@ void get_interp_spots_linT_low_eps(const double x, const double y, const double z, - double* __restrict__ delx, - double* __restrict__ dely, - double* __restrict__ delz, - int* __restrict__ idx) + double* restrict delx, + double* restrict dely, + double* restrict delz, + int* restrict idx) { using namespace nuc_eos;

@@ -176,11 +177,11 @@

static inline __attribute__((always_inline)) -void nuc_eos_C_linterp_one(const int* __restrict__ idx, +void nuc_eos_C_linterp_one(const int* restrict idx, const double delx, const double dely, const double delz, - double* __restrict__ f, + double* restrict f, const int iv) { using namespace nuc_eos; @@ -221,11 +222,11 @@ }

static inline __attribute__((always_inline)) -void nuc_eos_C_linterp_one_linT_low(const int* __restrict__ idx, +void nuc_eos_C_linterp_one_linT_low(const int* restrict idx, const double delx, const double dely, const double delz, - double* __restrict__ f, + double* restrict f, const int iv) { using namespace nuc_eos; @@ -267,11 +268,11 @@

static inline __attribute__((always_inline)) -void nuc_eos_C_linterp_one_linT_low_eps(const int* __restrict__ idx, +void nuc_eos_C_linterp_one_linT_low_eps(const int* restrict idx, const double delx, const double dely, const double delz, - double* __restrict__ f) + double* restrict f)

{ using namespace nuc_eos;

File [modified]: nuc_eos.hh Delta lines: +0 -1 =================================================================== --- trunk/src/nuc_eos_cxx/nuc_eos.hh 2014-03-13 03:01:30 UTC (rev 94) +++ trunk/src/nuc_eos_cxx/nuc_eos.hh 2014-03-13 03:01:36 UTC (rev 95) @@ -13,7 +13,6 @@ #define INVRHOGF 6.17714470405638e17 #define INVEPSGF 8.98755178736818e20 #define INVPRESSGF 5.55174079257738e38 -#define restrict __restrict__

namespace nuc_eos {