Skip to content

Commit e85b93e

Browse files
committed
Fix the call to get_str_data_array_params
git-svn-id: file:///home/users/tmap/svn/repos/ferret/branches/pyferret@27192 fdbf22ae-c210-0410-be80-ca943da6b8f8
1 parent 0320f28 commit e85b93e

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

fer/pyf/get_str_data_array_params.F

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@
3939
* Input:
4040
* datnam - description of the data array to retrieve
4141
* lennam - actual length of datnam
42-
* memory - ferret memory
4342
*
4443
* Output:
45-
* start - offset into memory giving the start of the data array
44+
* arraystart - offset into memory giving the start of the data array
4645
* memlo, memhi - array dimensions
4746
* (memlo() = memhi() = -999 for invalid axes)
4847
* steplo, stephi, incr - step values for the actual data requested

pyfermod/libpyferret.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ static PyObject *pyferretGetStrData(PyObject *self, PyObject *args, PyObject *kw
13481348
*/
13491349
FORTRAN(get_str_data_array_params)(dataname, &lendataname, &arraystart,
13501350
memlo, memhi, steplo, stephi, incr, axis_types,
1351-
errmsg, &lenerrmsg, 1024, 64, 2112);
1351+
errmsg, &lenerrmsg, 1024, 2112);
13521352
if ( lenerrmsg > 0 ) {
13531353
errmsg[lenerrmsg] = '\0';
13541354
PyErr_SetString(PyExc_ValueError, errmsg);

pyfermod/pyferret.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void FORTRAN(get_str_data_array_params)(char dataname[], int *lendataname, char
8383
int memlo[MAX_FERRET_NDIM], int memhi[MAX_FERRET_NDIM],
8484
int steplo[MAX_FERRET_NDIM], int stephi[MAX_FERRET_NDIM],
8585
int incr[MAX_FERRET_NDIM], AXISTYPE axtypes[MAX_FERRET_NDIM], char errmsg[],
86-
int *lenerrmsg, int maxlen_dataname, int maxlen_dataunit, int maxlen_errmsg);
86+
int *lenerrmsg, int maxlen_dataname, int maxlen_errmsg);
8787
void FORTRAN(get_data_array_coords)(double axiscoords[], char axisunit[], char axisname[],
8888
int *axisnum, int *numcoords, char errmsg[], int *lenerrmsg,
8989
int maxlen_axisunit, int maxlen_axisname, int maxlen_errmsg);

0 commit comments

Comments
 (0)