diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-25 17:22:24 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-25 17:22:24 +0000 |
| commit | 6489a632114121142dea6f3ca12d6b8d49d2d73c (patch) | |
| tree | 8498a0f7a31440f93b86eaa9136aba36e918df01 /src/include/cctk.h | |
| parent | 2f1487f14c14ac562608108f9feb6281f6527473 (diff) | |
New names for everything that is passed into rfred routines
git-svn-id: http://svn.cactuscode.org/flesh/trunk@584 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include/cctk.h')
| -rw-r--r-- | src/include/cctk.h | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h index 8a4c0292..dec3c66b 100644 --- a/src/include/cctk.h +++ b/src/include/cctk.h @@ -32,16 +32,18 @@ print *,"----------------------------------------------------------------" -#define _CCTK_FARGUMENTS dim, global_sh, sh, lb, ub, bbox, delta_time, time, delta_space, origin_space, levfac, convlevel, nghostzones, iteration, GH -#define _DECLARE_CCTK_FARGUMENTS INTEGER dim&&\ - INTEGER global_sh(dim)&&\ - INTEGER sh(dim), lb(dim), ub(dim), bbox(2*dim)&&\ - CCTK_REAL delta_time, time, delta_space(dim)&&\ - CCTK_REAL origin_space(dim)&&\ - INTEGER levfac&&\ - INTEGER convlevel&&\ - INTEGER nghostzones&&\ - INTEGER iteration&&\ +#define _CCTK_FARGUMENTS cctk_dim, cctk_gsh, cctk_lsh, cctk_lbnd, cctk_ubnd, cctk_from, cctk_to, cctk_bbox, cctk_delta_time, cctk_time, cctk_delta_space, cctk_origin_space, cctk_levfac, cctk_convlevel, cctk_nghostzones, cctk_iteration, GH +#define _DECLARE_CCTK_FARGUMENTS CCTK_INT cctk_dim&&\ + INTEGER cctk_gsh(cctk_dim),cctk_lsh(cctk_dim)&&\ + INTEGER cctk_lbnd(cctk_dim),cctk_ubnd(cctk_dim)&&\ + INTEGER cctk_from(cctk_dim),cctk_to(cctk_dim),cctk_bbox(2*cctk_dim)&&\ + CCTK_REAL cctk_delta_time, cctk_time&&\ + CCTK_REAL cctk_delta_space(cctk_dim)&&\ + CCTK_REAL cctk_origin_space(cctk_dim)&&\ + INTEGER cctk_levfac(cctk_dim)&&\ + INTEGER cctk_convlevel&&\ + INTEGER cctk_nghostzones(cctk_dim)&&\ + INTEGER cctk_iteration&&\ CCTK_POINTER GH&&\ #endif /*FCODE*/ @@ -55,19 +57,19 @@ #define _INITIALISE_CCTK_C2F #define _DECLARE_CCTK_C2F -#define _PASS_CCTK_C2F(xGH) &((xGH)->dim),\ - (xGH)->global_shape,\ - (xGH)->local_shape, (xGH)->lower_bound, (xGH)->upper_bound, (xGH)->bbox,\ - &((xGH)->delta_time), &((xGH)->time), (xGH)->delta_space,\ - (xGH)->origin_space,\ - &((xGH)->levfac),\ - &((xGH)->convlevel),\ - &((xGH)->nghostzones),\ - &((xGH)->iteration),\ +#define _PASS_CCTK_C2F(xGH) &((xGH)->cctk_dim),\ + (xGH)->cctk_gsh,\ + (xGH)->cctk_lsh, (xGH)->cctk_lbnd, (xGH)->cctk_ubnd, (xGH)->cctk_from,(xGH)->cctk_to,(xGH)->cctk_bbox,\ + &((xGH)->cctk_delta_time), &((xGH)->cctk_time), (xGH)->cctk_delta_space,\ + (xGH)->cctk_origin_space,\ + (xGH)->cctk_levfac,\ + &((xGH)->cctk_convlevel),\ + (xGH)->cctk_nghostzones,\ + &((xGH)->cctk_iteration),\ (xGH) #define _CCTK_C2F_PROTO int *,\ int *,\ - int *,int *, int *, int *,\ + int *,int *, int *, int *,int *,int *,\ CCTK_REAL *, CCTK_REAL *, CCTK_REAL *,\ CCTK_REAL *,\ int *,\ @@ -76,8 +78,8 @@ int *,\ cGH * -#define CCTK_STORAGESIZE(xGH, group, dim) (CCTK_QueryGroupStorage(xGH,group) ?\ - (CCTK_ArrayGroupSize(xGH, group, dim)) : &(_cctk_one)) +#define CCTK_STORAGESIZE(xGH, group, cctk_dim) (CCTK_QueryGroupStorage(xGH,group) ?\ + (CCTK_ArrayGroupSize(xGH, group, cctk_dim)) : &(_cctk_one)) extern int _cctk_one; |