diff options
Diffstat (limited to 'src/CartGrid3D.c')
| -rw-r--r-- | src/CartGrid3D.c | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/CartGrid3D.c b/src/CartGrid3D.c index e25c435..14bdb0e 100644 --- a/src/CartGrid3D.c +++ b/src/CartGrid3D.c @@ -18,20 +18,22 @@ static char *rcsid = "$Header$"; #include "cctk.h" #include "cctk_arguments.h" #include "cctk_parameters.h" -/* -void bitant_byrange(CCTK_DECLARE_CARGUMENTS, - CCTK_REAL this_dx, - CCTK_REAL this_dy, - CCTK_REAL this_dz, - CCTK_REAL *x_origin, - CCTK_REAL *y_origin, - CCTK_REAL *z_origin); -*/ + +void bitant_byspacing(CCTK_CARGUMENTS, + CCTK_REAL this_dx, + CCTK_REAL this_dy, + CCTK_REAL this_dz, + CCTK_REAL *x_origin, + CCTK_REAL *y_origin, + CCTK_REAL *z_origin); + + #define max(a,b) ((a) > (b) ? (a) : (b)) #define SQR(a) ((a)*(a)) void CartGrid3D(CCTK_CARGUMENTS) { + DECLARE_CCTK_CARGUMENTS DECLARE_CCTK_PARAMETERS @@ -40,7 +42,6 @@ void CartGrid3D(CCTK_CARGUMENTS) CCTK_REAL this_dx,this_dy,this_dz; CCTK_REAL xmin1,ymin1,zmin1,xmax1,ymax1,zmax1; CCTK_REAL lowerx,upperx,lowery,uppery,lowerz,upperz; - CCTK_REAL olower,oupper; char infoline[120]; iconv = pow(2, cctk_convlevel-1); @@ -185,12 +186,12 @@ void CartGrid3D(CCTK_CARGUMENTS) if (CCTK_Equals(domain,"bitant")) { bitant_byspacing(CCTK_PASS_CTOC, - this_dx, - this_dy, - this_dz, - &x_origin, - &y_origin, - &z_origin); + this_dx, + this_dy, + this_dz, + &x_origin, + &y_origin, + &z_origin); } else if (CCTK_Equals(domain,"quadrant")) { @@ -308,13 +309,13 @@ void CartGrid3D(CCTK_CARGUMENTS) lowerx = x_origin; upperx = x_origin+this_dx*(cctk_gsh[0]-1); - CCTK_RegisterCoordRange(cctkGH,lowerx,upperx,"x"); + CCTK_CoordRegisterRange(cctkGH,lowerx,upperx,"x"); lowery = y_origin; uppery = y_origin+this_dy*(cctk_gsh[1]-1); - CCTK_RegisterCoordRange(cctkGH,lowery,uppery,"y"); + CCTK_CoordRegisterRange(cctkGH,lowery,uppery,"y"); lowerz = z_origin; upperz = z_origin+this_dz*(cctk_gsh[2]-1); - CCTK_RegisterCoordRange(cctkGH,lowerz,upperz,"z"); + CCTK_CoordRegisterRange(cctkGH,lowerz,upperz,"z"); sprintf(infoline," %s%12.7e %s%12.7e %s%12.7e ", "dx=>",cctk_delta_space[0], @@ -346,6 +347,10 @@ void CartGrid3D(CCTK_CARGUMENTS) z[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])]); #endif + + USE_CCTK_CARGUMENTS + USE_CCTK_PARAMETERS + } |