diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-05 11:10:17 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-11-05 11:10:17 +0100 |
| commit | e1f2f859e91307104bb8600c057cc7a742ce9349 (patch) | |
| tree | e53552fddd28b0cea455e4a21f9920344e58e40f | |
| parent | 6b9c2c1e8de8d05a2c386393f0f5cac20157f590 (diff) | |
Simplify ISO_R macro
| -rw-r--r-- | src/trumpet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trumpet.c b/src/trumpet.c index e21aa9a..e2f13ed 100644 --- a/src/trumpet.c +++ b/src/trumpet.c @@ -25,7 +25,7 @@ /* * isotropic/coordinate radius */ -#define ISO_R(x, y, z, index, gamma) (sqrt(SQR(gamma*x[index]) + SQR(y[index]) + SQR(z[index]) + EPS)) +#define ISO_R(x, y, z, gamma) (sqrt(SQR(gamma*x) + SQR(y) + SQR(z) + EPS)) #define TRUMPET_ALPHA(R) (sqrt(1 - 2*MASS/R + SQR(TRUMPET_CONST)/SQR(SQR(R)))) @@ -195,7 +195,7 @@ void trumpet_data(CCTK_ARGUMENTS) for (int i = 0; i < cctk_lsh[0]; i++) { int index = CCTK_GFINDEX3D(cctkGH, i, j, k); CCTK_REAL xx = gamma*x[index], yy = y[index], zz = z[index]; - CCTK_REAL r = ISO_R(x, y, z, index, gamma); + CCTK_REAL r = ISO_R(xx, yy, zz, gamma); CCTK_REAL R = gsl_spline_eval(spline, r, acc); CCTK_REAL alpha = TRUMPET_ALPHA(R); @@ -247,7 +247,7 @@ void trumpet_lapse(CCTK_ARGUMENTS) for (int i = 0; i < cctk_lsh[0]; i++) { int index = CCTK_GFINDEX3D(cctkGH, i, j, k); CCTK_REAL xx = gamma*x[index], yy = y[index], zz = z[index]; - CCTK_REAL r = ISO_R(x, y, z, index, gamma); + CCTK_REAL r = ISO_R(xx, yy, zz, gamma); CCTK_REAL R = gsl_spline_eval(spline, r, acc); CCTK_REAL alpha = TRUMPET_ALPHA(R); @@ -288,7 +288,7 @@ void trumpet_shift(CCTK_ARGUMENTS) for (int i = 0; i < cctk_lsh[0]; i++) { int index = CCTK_GFINDEX3D(cctkGH, i, j, k); CCTK_REAL xx = gamma*x[index], yy = y[index], zz = z[index]; - CCTK_REAL r = ISO_R(x, y, z, index, gamma); + CCTK_REAL r = ISO_R(xx, yy, zz, gamma); CCTK_REAL R = gsl_spline_eval(spline, r, acc); CCTK_REAL alpha = TRUMPET_ALPHA(R); |