From dcce007f3824009b46e8da2947247df64fc77bb0 Mon Sep 17 00:00:00 2001 From: schnetter Date: Tue, 28 Oct 2003 13:48:23 +0000 Subject: Change the way in which pointers are passed to and from Fortran. git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Cartoon2D/trunk@73 eec4d7dc-71c2-46d6-addf-10296150bf52 --- interface.ccl | 2 +- src/Cartoon2DBC.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/interface.ccl b/interface.ccl index d21c7ea..d6f3ed2 100644 --- a/interface.ccl +++ b/interface.ccl @@ -8,7 +8,7 @@ INCLUDES HEADER: Cartoon2D.h in Cartoon2D.h # Function aliases: -CCTK_INT FUNCTION Boundary_SelectedGVs(CCTK_POINTER IN GH, \ +CCTK_INT FUNCTION Boundary_SelectedGVs(CCTK_POINTER_TO_CONST IN GH, \ CCTK_INT IN array_size, CCTK_INT ARRAY OUT var_indicies, \ CCTK_INT ARRAY OUT faces, CCTK_INT ARRAY OUT boundary_widths, \ CCTK_INT ARRAY OUT table_handles, CCTK_STRING IN bc_name) diff --git a/src/Cartoon2DBC.c b/src/Cartoon2DBC.c index 8eb0453..840c042 100644 --- a/src/Cartoon2DBC.c +++ b/src/Cartoon2DBC.c @@ -35,12 +35,12 @@ static CCTK_REAL Cartoon2DInterp(const cGH *GH, CCTK_REAL *f, int i, int di, int ijk, CCTK_REAL x); CCTK_REAL interpolate_local(int order, CCTK_REAL x0, CCTK_REAL dx, CCTK_REAL y[], CCTK_REAL x); -void CCTK_FCALL CCTK_FNAME(BndCartoon2DVI)(int *retval, const cGH *GH, +void CCTK_FCALL CCTK_FNAME(BndCartoon2DVI)(int *retval, const cGH **GH, int *tensortype, int *vi); -void CCTK_FCALL CCTK_FNAME(BndCartoon2DVN)(int *retval, const cGH *GH, +void CCTK_FCALL CCTK_FNAME(BndCartoon2DVN)(int *retval, const cGH **GH, int *tensortype, ONE_FORTSTRING_ARG); void CCTK_FCALL CCTK_FNAME(BndCartoon2DGN) - (int *retval, const cGH *GH, int *tensortype, ONE_FORTSTRING_ARG); + (int *retval, const cGH **GH, int *tensortype, ONE_FORTSTRING_ARG); /* set boundaries of a grid tensor assuming axisymmetry @@ -242,9 +242,9 @@ int BndCartoon2DVI(const cGH *GH, int tensortype, int vi) } void CCTK_FCALL CCTK_FNAME(BndCartoon2DVI) - (int *retval, const cGH *GH, int *tensortype, int *vi) + (int *retval, const cGH **GH, int *tensortype, int *vi) { - *retval = BndCartoon2DVI(GH, *tensortype, *vi); + *retval = BndCartoon2DVI(*GH, *tensortype, *vi); } int BndCartoon2DVN(const cGH *GH, int tensortype, const char *inpvarname) @@ -260,10 +260,10 @@ int BndCartoon2DVN(const cGH *GH, int tensortype, const char *inpvarname) } void CCTK_FCALL CCTK_FNAME(BndCartoon2DVN) - (int *retval, const cGH *GH, int *tensortype, ONE_FORTSTRING_ARG) + (int *retval, const cGH **GH, int *tensortype, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(impvarname) - *retval = BndCartoon2DVN(GH, *tensortype, impvarname); + *retval = BndCartoon2DVN(*GH, *tensortype, impvarname); free(impvarname); } @@ -303,10 +303,10 @@ int BndCartoon2DGN(const cGH *GH, int tensortype, const char *group) } void CCTK_FCALL CCTK_FNAME(BndCartoon2DGN) - (int *retval, const cGH *GH, int *tensortype, ONE_FORTSTRING_ARG) + (int *retval, const cGH **GH, int *tensortype, ONE_FORTSTRING_ARG) { ONE_FORTSTRING_CREATE(group) - *retval = BndCartoon2DGN(GH, *tensortype, group); + *retval = BndCartoon2DGN(*GH, *tensortype, group); free(group); } -- cgit v1.2.3