diff options
Diffstat (limited to 'src/ChooseOutput.c')
-rw-r--r-- | src/ChooseOutput.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ChooseOutput.c b/src/ChooseOutput.c index 7366fa7..04497c5 100644 --- a/src/ChooseOutput.c +++ b/src/ChooseOutput.c @@ -13,6 +13,7 @@ #include <string.h> #include "cctk.h" +#include "cctk_Arguments.h" #include "cctk_Parameters.h" #include "CactusBase/IOUtil/src/ioutil_Utils.h" #include "ioJpegGH.h" @@ -41,8 +42,6 @@ CCTK_FILEVERSION(CactusIO_IOJpeg_ChooseOutput_c) /******************************************************************** ******************** External Routines ************************ ********************************************************************/ -void IOJpeg_ChooseOutput (const cGH *GH); - /*@@ @routine IOJpeg_ChooseOutput @@ -60,13 +59,14 @@ void IOJpeg_ChooseOutput (const cGH *GH); @vio in @endvar @@*/ -void IOJpeg_ChooseOutput (const cGH *GH) +void IOJpeg_ChooseOutput (CCTK_ARGUMENTS) { int i, maxdim; ioJpegGH *myGH; int origin_index[3]; CCTK_REAL origin_phys[3]; - DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; GET_SLICE (out2D_xyplane_z, out_xyplane_z, origin_index[0], origin_phys[0]); @@ -74,7 +74,7 @@ void IOJpeg_ChooseOutput (const cGH *GH) GET_SLICE (out2D_yzplane_x, out_yzplane_x, origin_index[2], origin_phys[2]); maxdim = CCTK_MaxDim (); - myGH = (ioJpegGH *) CCTK_GHExtension (GH, "IOJpeg"); + myGH = (ioJpegGH *) CCTK_GHExtension (cctkGH, "IOJpeg"); myGH->sp2xyz = (int **) malloc (3 * sizeof (int *)); for (i = 0; i < maxdim; i++) @@ -83,7 +83,7 @@ void IOJpeg_ChooseOutput (const cGH *GH) if (i > 0 && i < 3) { - IOUtil_2DPlanes (GH, i + 1, origin_index, origin_phys, myGH->sp2xyz[i]); + IOUtil_2DPlanes (cctkGH, i + 1, origin_index, origin_phys, myGH->sp2xyz[i]); } } } |