diff options
| author | tradke <tradke@94b1c47f-dcfd-45ef-a468-0854c0e9e350> | 2004-01-23 19:16:28 +0000 |
|---|---|---|
| committer | tradke <tradke@94b1c47f-dcfd-45ef-a468-0854c0e9e350> | 2004-01-23 19:16:28 +0000 |
| commit | d64fe31cd42b68313f2e4739fbcf636ad762138d (patch) | |
| tree | b488e752d09cb107d2a41d2f03c21da964138d0b | |
| parent | 27de9af3380fae70b2485a842ca88e4512cc3ef5 (diff) | |
Renamed some aliased hyperslab functions to comply with the maximum length
for names of Fortran routines (31 characters):
Hyperslab_DefineGlobalMappingByPhys -> Hyperslab_GlobalMappingByPhys
Hyperslab_DefineGlobalMappingByIndex -> Hyperslab_GlobalMappingByIndex
Hyperslab_DefineLocalMappingByPhys -> Hyperslab_LocalMappingByPhys
Hyperslab_DefineLocalMappingByIndex -> Hyperslab_LocalMappingByIndex
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOASCII/trunk@157 94b1c47f-dcfd-45ef-a468-0854c0e9e350
| -rw-r--r-- | interface.ccl | 36 | ||||
| -rw-r--r-- | src/Write1D.c | 16 | ||||
| -rw-r--r-- | src/Write2D.c | 16 | ||||
| -rw-r--r-- | src/Write3D.c | 16 |
4 files changed, 39 insertions, 45 deletions
diff --git a/interface.ccl b/interface.ccl index ec70bf1..6961067 100644 --- a/interface.ccl +++ b/interface.ccl @@ -17,27 +17,27 @@ CCTK_INT FUNCTION \ CCTK_INT ARRAY OUT retvals) CCTK_INT FUNCTION \ - Hyperslab_DefineGlobalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \ - CCTK_INT IN vindex, \ - CCTK_INT IN hdim, \ - CCTK_INT ARRAY IN direction, \ - CCTK_INT ARRAY IN origin, \ - CCTK_INT ARRAY IN extent, \ - CCTK_INT ARRAY IN downsample, \ - CCTK_INT IN table_handle, \ - CCTK_INT IN CCTK_FPOINTER \ - conversion_fn (CCTK_INT IN nelems, \ - CCTK_INT IN src_stride,\ - CCTK_INT IN dst_stride,\ - CCTK_INT IN src_type, \ - CCTK_INT IN dst_type, \ - CCTK_POINTER IN src, \ - CCTK_POINTER OUT dst), \ - CCTK_INT ARRAY OUT hsize) + Hyperslab_GlobalMappingByIndex (CCTK_POINTER_TO_CONST IN cctkGH, \ + CCTK_INT IN vindex, \ + CCTK_INT IN hdim, \ + CCTK_INT ARRAY IN direction, \ + CCTK_INT ARRAY IN origin, \ + CCTK_INT ARRAY IN extent, \ + CCTK_INT ARRAY IN downsample, \ + CCTK_INT IN table_handle, \ + CCTK_INT IN CCTK_FPOINTER \ + conversion_fn (CCTK_INT IN nelems, \ + CCTK_INT IN src_stride,\ + CCTK_INT IN dst_stride,\ + CCTK_INT IN src_type, \ + CCTK_INT IN dst_type, \ + CCTK_POINTER IN src, \ + CCTK_POINTER OUT dst), \ + CCTK_INT ARRAY OUT hsize) CCTK_INT FUNCTION Hyperslab_FreeMapping (CCTK_INT IN mapping_handle) USES FUNCTION Hyperslab_GetList -USES FUNCTION Hyperslab_DefineGlobalMappingByIndex +USES FUNCTION Hyperslab_GlobalMappingByIndex USES FUNCTION Hyperslab_FreeMapping diff --git a/src/Write1D.c b/src/Write1D.c index 73cf413..40a44ba 100644 --- a/src/Write1D.c +++ b/src/Write1D.c @@ -98,7 +98,7 @@ static void WriteData (int vtype, It writes to ASCII files suitable for gnuplot and xgraph. A header telling the physical time prefixes the output data. @enddesc - @calls Hyperslab_DefineGlobalMappingByIndex + @calls Hyperslab_GlobalMappingByIndex Hyperslab_FreeMapping Hyperslab_GetList OpenFile @@ -332,14 +332,12 @@ fprintf (stderr, "%d/%d\n", origin[dir], extent); memset (origin, 0, gdata.dim * sizeof (CCTK_INT)); } - mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 1, - direction, - origin, - &extent, - NULL, /* downsample */ - -1, /* table handle */ - NULL /* conversion fn */, - &hsize); + mapping = Hyperslab_GlobalMappingByIndex (GH, vindex, 1, + direction, origin, &extent, + NULL, /* downsample */ + -1, /* table handle */ + NULL /* conversion fn */, + &hsize); if (mapping < 0) { CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, diff --git a/src/Write2D.c b/src/Write2D.c index cf3fe35..d652f4c 100644 --- a/src/Write2D.c +++ b/src/Write2D.c @@ -94,7 +94,7 @@ static void WriteData (int vtype, @desc Writes the 2D slices of a variable into separate ASCII files. @enddesc - @calls Hyperslab_DefineGlobalMappingByIndex + @calls Hyperslab_GlobalMappingByIndex Hyperslab_FreeMapping Hyperslab_GetList OpenFile @@ -260,14 +260,12 @@ int IOASCII_Write2D (const cGH *GH, int vindex, const char *alias) memset (direction, 0, sizeof (direction)); direction[dir_i] = direction[gdata.dim + dir_j] = 1; - mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 2, - direction, - origin, - extent, - NULL, /* downsample */ - -1, /* table handle */ - NULL /* conversion fn */, - hsize); + mapping = Hyperslab_GlobalMappingByIndex (GH, vindex, 2, + direction, origin, extent, + NULL, /* downsample */ + -1, /* table handle */ + NULL /* conversion fn */, + hsize); if (mapping < 0) { CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, diff --git a/src/Write3D.c b/src/Write3D.c index 6a20e2d..8db2f23 100644 --- a/src/Write3D.c +++ b/src/Write3D.c @@ -90,7 +90,7 @@ static void WriteData (int vtype, @desc Writes the 3D volume of a variable into a gnuplot ASCII file. @enddesc - @calls Hyperslab_DefineGlobalMappingByIndex + @calls Hyperslab_GlobalMappingByIndex Hyperslab_FreeMapping Hyperslab_GetList OpenFile @@ -213,14 +213,12 @@ int IOASCII_Write3D (const cGH *GH, int vindex, const char *alias) } /* get the hyperslab mapping */ - mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 3, - direction, - origin, - extent, - NULL, /* downsample */ - -1, /* table handle */ - NULL /* conversion fn */, - hsize); + mapping = Hyperslab_GlobalMappingByIndex (GH, vindex, 3, + direction, origin, extent, + NULL, /* downsample */ + -1, /* table handle */ + NULL /* conversion fn */, + hsize); if (mapping < 0) { CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, |