Skip to content

GitLab

Commit 054817f6 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix incomplete name change in "Renamed DefPrec/InqPrec to DefDatatype/InqDatatype."

parent fe822f8d
Hide whitespace changes
Inline Side-by-side
examples/pio/compareResourcesArray.c
View file @ 054817f6
......@@ -57,7 +57,7 @@ static int defineGrid()
gridDefYname ( gridID, "myYname" );
gridDefYlongname ( gridID, "myYlongname" );
gridDefYunits ( gridID, "myYunits" );
gridDefPrec ( gridID, DOUBLE_PRECISION );
gridDefDatatype ( gridID, DOUBLE_PRECISION );
gridDefTrunc ( gridID, 1 );
gridDefNumber ( gridID, 6 );
gridDefPosition ( gridID, 7 );
......@@ -89,7 +89,7 @@ static int defineZaxis ()
zaxisDefName ( zaxisID, "myName" );
zaxisDefLongname ( zaxisID, "myLongname" );
zaxisDefUnits ( zaxisID, "myUnits" );
zaxisDefPrec ( zaxisID, DOUBLE_PRECISION );
zaxisDefDatatype ( zaxisID, DOUBLE_PRECISION );
zaxisDefLtype ( zaxisID, 1 );
zaxisDefVct ( zaxisID, 3, vct );
zaxisDefLbounds ( zaxisID, &levs[0] );
......
interfaces/python/CdiLib.py
View file @ 054817f6
......@@ -321,8 +321,8 @@ gridInqYname = _CdiLib.gridInqYname
gridInqYlongname = _CdiLib.gridInqYlongname
gridInqYstdname = _CdiLib.gridInqYstdname
gridInqYunits = _CdiLib.gridInqYunits
gridDefPrec = _CdiLib.gridDefPrec
gridInqPrec = _CdiLib.gridInqPrec
gridDefDatatype = _CdiLib.gridDefDatatype
gridInqDatatype = _CdiLib.gridInqDatatype
gridInqXval = _CdiLib.gridInqXval
gridInqYval = _CdiLib.gridInqYval
gridInqXinc = _CdiLib.gridInqXinc
......@@ -382,8 +382,8 @@ zaxisDefUnits = _CdiLib.zaxisDefUnits
zaxisInqName = _CdiLib.zaxisInqName
zaxisInqLongname = _CdiLib.zaxisInqLongname
zaxisInqUnits = _CdiLib.zaxisInqUnits
zaxisDefPrec = _CdiLib.zaxisDefPrec
zaxisInqPrec = _CdiLib.zaxisInqPrec
zaxisDefDatatype = _CdiLib.zaxisDefDatatype
zaxisInqDatatype = _CdiLib.zaxisInqDatatype
zaxisDefLtype = _CdiLib.zaxisDefLtype
zaxisInqLtype = _CdiLib.zaxisInqLtype
zaxisInqLevelsPtr = _CdiLib.zaxisInqLevelsPtr
......
interfaces/python/cdilib_wrap.c
View file @ 054817f6
......@@ -8056,7 +8056,7 @@ fail:
}
SWIGINTERN PyObject *_wrap_gridDefPrec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_gridDefDatatype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
int arg1 ;
int arg2 ;
......@@ -8067,18 +8067,18 @@ SWIGINTERN PyObject *_wrap_gridDefPrec(PyObject *SWIGUNUSEDPARM(self), PyObject
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
if (!PyArg_ParseTuple(args,(char *)"OO:gridDefPrec",&obj0,&obj1)) SWIG_fail;
if (!PyArg_ParseTuple(args,(char *)"OO:gridDefDatatype",&obj0,&obj1)) SWIG_fail;
ecode1 = SWIG_AsVal_int(obj0, &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "gridDefPrec" "', argument " "1"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "gridDefDatatype" "', argument " "1"" of type '" "int""'");
}
arg1 = (int)(val1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "gridDefPrec" "', argument " "2"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "gridDefDatatype" "', argument " "2"" of type '" "int""'");
}
arg2 = (int)(val2);
gridDefPrec(arg1,arg2);
gridDefDatatype(arg1,arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
......@@ -8086,7 +8086,7 @@ fail:
}
SWIGINTERN PyObject *_wrap_gridInqPrec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_gridInqDatatype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
int arg1 ;
int val1 ;
......@@ -8094,13 +8094,13 @@ SWIGINTERN PyObject *_wrap_gridInqPrec(PyObject *SWIGUNUSEDPARM(self), PyObject
PyObject * obj0 = 0 ;
int result;
if (!PyArg_ParseTuple(args,(char *)"O:gridInqPrec",&obj0)) SWIG_fail;
if (!PyArg_ParseTuple(args,(char *)"O:gridInqDatatype",&obj0)) SWIG_fail;
ecode1 = SWIG_AsVal_int(obj0, &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "gridInqPrec" "', argument " "1"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "gridInqDatatype" "', argument " "1"" of type '" "int""'");
}
arg1 = (int)(val1);
result = (int)gridInqPrec(arg1);
result = (int)gridInqDatatype(arg1);
resultobj = SWIG_From_int((int)(result));
return resultobj;
fail:
......@@ -10004,7 +10004,7 @@ fail:
}
SWIGINTERN PyObject *_wrap_zaxisDefPrec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_zaxisDefDatatype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
int arg1 ;
int arg2 ;
......@@ -10015,18 +10015,18 @@ SWIGINTERN PyObject *_wrap_zaxisDefPrec(PyObject *SWIGUNUSEDPARM(self), PyObject
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
if (!PyArg_ParseTuple(args,(char *)"OO:zaxisDefPrec",&obj0,&obj1)) SWIG_fail;
if (!PyArg_ParseTuple(args,(char *)"OO:zaxisDefDatatype",&obj0,&obj1)) SWIG_fail;
ecode1 = SWIG_AsVal_int(obj0, &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "zaxisDefPrec" "', argument " "1"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "zaxisDefDatatype" "', argument " "1"" of type '" "int""'");
}
arg1 = (int)(val1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "zaxisDefPrec" "', argument " "2"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "zaxisDefDatatype" "', argument " "2"" of type '" "int""'");
}
arg2 = (int)(val2);
zaxisDefPrec(arg1,arg2);
zaxisDefDatatype(arg1,arg2);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
......@@ -10034,7 +10034,7 @@ fail:
}
SWIGINTERN PyObject *_wrap_zaxisInqPrec(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_zaxisInqDatatype(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
int arg1 ;
int val1 ;
......@@ -10042,13 +10042,13 @@ SWIGINTERN PyObject *_wrap_zaxisInqPrec(PyObject *SWIGUNUSEDPARM(self), PyObject
PyObject * obj0 = 0 ;
int result;
if (!PyArg_ParseTuple(args,(char *)"O:zaxisInqPrec",&obj0)) SWIG_fail;
if (!PyArg_ParseTuple(args,(char *)"O:zaxisInqDatatype",&obj0)) SWIG_fail;
ecode1 = SWIG_AsVal_int(obj0, &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "zaxisInqPrec" "', argument " "1"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "zaxisInqDatatype" "', argument " "1"" of type '" "int""'");
}
arg1 = (int)(val1);
result = (int)zaxisInqPrec(arg1);
result = (int)zaxisInqDatatype(arg1);
resultobj = SWIG_From_int((int)(result));
return resultobj;
fail:
......@@ -12474,8 +12474,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"gridInqYlongname", _wrap_gridInqYlongname, METH_VARARGS, NULL},
{ (char *)"gridInqYstdname", _wrap_gridInqYstdname, METH_VARARGS, NULL},
{ (char *)"gridInqYunits", _wrap_gridInqYunits, METH_VARARGS, NULL},
{ (char *)"gridDefPrec", _wrap_gridDefPrec, METH_VARARGS, NULL},
{ (char *)"gridInqPrec", _wrap_gridInqPrec, METH_VARARGS, NULL},
{ (char *)"gridDefDatatype", _wrap_gridDefDatatype, METH_VARARGS, NULL},
{ (char *)"gridInqDatatype", _wrap_gridInqDatatype, METH_VARARGS, NULL},
{ (char *)"gridInqXval", _wrap_gridInqXval, METH_VARARGS, NULL},
{ (char *)"gridInqYval", _wrap_gridInqYval, METH_VARARGS, NULL},
{ (char *)"gridInqXinc", _wrap_gridInqXinc, METH_VARARGS, NULL},
......@@ -12535,8 +12535,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"zaxisInqName", _wrap_zaxisInqName, METH_VARARGS, NULL},
{ (char *)"zaxisInqLongname", _wrap_zaxisInqLongname, METH_VARARGS, NULL},
{ (char *)"zaxisInqUnits", _wrap_zaxisInqUnits, METH_VARARGS, NULL},
{ (char *)"zaxisDefPrec", _wrap_zaxisDefPrec, METH_VARARGS, NULL},
{ (char *)"zaxisInqPrec", _wrap_zaxisInqPrec, METH_VARARGS, NULL},
{ (char *)"zaxisDefDatatype", _wrap_zaxisDefDatatype, METH_VARARGS, NULL},
{ (char *)"zaxisInqDatatype", _wrap_zaxisInqDatatype, METH_VARARGS, NULL},
{ (char *)"zaxisDefLtype", _wrap_zaxisDefLtype, METH_VARARGS, NULL},
{ (char *)"zaxisInqLtype", _wrap_zaxisInqLtype, METH_VARARGS, NULL},
{ (char *)"zaxisInqLevelsPtr", _wrap_zaxisInqLevelsPtr, METH_VARARGS, NULL},
......
interfaces/ruby/cdilib_wrap.c
View file @ 054817f6
......@@ -7226,7 +7226,7 @@ fail:
SWIGINTERN VALUE
_wrap_gridDefPrec(int argc, VALUE *argv, VALUE self) {
_wrap_gridDefDatatype(int argc, VALUE *argv, VALUE self) {
int arg1 ;
int arg2 ;
int val1 ;
......@@ -7239,15 +7239,15 @@ _wrap_gridDefPrec(int argc, VALUE *argv, VALUE self) {
}
ecode1 = SWIG_AsVal_int(argv[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","gridDefPrec", 1, argv[0] ));
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","gridDefDatatype", 1, argv[0] ));
}
arg1 = (int)(val1);
ecode2 = SWIG_AsVal_int(argv[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","gridDefPrec", 2, argv[1] ));
SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","gridDefDatatype", 2, argv[1] ));
}
arg2 = (int)(val2);
gridDefPrec(arg1,arg2);
gridDefDatatype(arg1,arg2);
return Qnil;
fail:
return Qnil;
......@@ -7255,7 +7255,7 @@ fail:
SWIGINTERN VALUE
_wrap_gridInqPrec(int argc, VALUE *argv, VALUE self) {
_wrap_gridInqDatatype(int argc, VALUE *argv, VALUE self) {
int arg1 ;
int val1 ;
int ecode1 = 0 ;
......@@ -7267,10 +7267,10 @@ _wrap_gridInqPrec(int argc, VALUE *argv, VALUE self) {
}
ecode1 = SWIG_AsVal_int(argv[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","gridInqPrec", 1, argv[0] ));
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","gridInqDatatype", 1, argv[0] ));
}
arg1 = (int)(val1);
result = (int)gridInqPrec(arg1);
result = (int)gridInqDatatype(arg1);
vresult = SWIG_From_int((int)(result));
return vresult;
fail:
......@@ -9155,7 +9155,7 @@ fail:
SWIGINTERN VALUE
_wrap_zaxisDefPrec(int argc, VALUE *argv, VALUE self) {
_wrap_zaxisDefDatatype(int argc, VALUE *argv, VALUE self) {
int arg1 ;
int arg2 ;
int val1 ;
......@@ -9168,15 +9168,15 @@ _wrap_zaxisDefPrec(int argc, VALUE *argv, VALUE self) {
}
ecode1 = SWIG_AsVal_int(argv[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","zaxisDefPrec", 1, argv[0] ));
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","zaxisDefDatatype", 1, argv[0] ));
}
arg1 = (int)(val1);
ecode2 = SWIG_AsVal_int(argv[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","zaxisDefPrec", 2, argv[1] ));
SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","zaxisDefDatatype", 2, argv[1] ));
}
arg2 = (int)(val2);
zaxisDefPrec(arg1,arg2);
zaxisDefDatatype(arg1,arg2);
return Qnil;
fail:
return Qnil;
......@@ -9184,7 +9184,7 @@ fail:
SWIGINTERN VALUE
_wrap_zaxisInqPrec(int argc, VALUE *argv, VALUE self) {
_wrap_zaxisInqDatatype(int argc, VALUE *argv, VALUE self) {
int arg1 ;
int val1 ;
int ecode1 = 0 ;
......@@ -9196,10 +9196,10 @@ _wrap_zaxisInqPrec(int argc, VALUE *argv, VALUE self) {
}
ecode1 = SWIG_AsVal_int(argv[0], &val1);
if (!SWIG_IsOK(ecode1)) {
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","zaxisInqPrec", 1, argv[0] ));
SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","zaxisInqDatatype", 1, argv[0] ));
}
arg1 = (int)(val1);
result = (int)zaxisInqPrec(arg1);
result = (int)zaxisInqDatatype(arg1);
vresult = SWIG_From_int((int)(result));
return vresult;
fail:
......@@ -12056,8 +12056,8 @@ SWIGEXPORT void Init_CdiLib(void) {
rb_define_module_function(mCdiLib, "gridInqYlongname", _wrap_gridInqYlongname, -1);
rb_define_module_function(mCdiLib, "gridInqYstdname", _wrap_gridInqYstdname, -1);
rb_define_module_function(mCdiLib, "gridInqYunits", _wrap_gridInqYunits, -1);
rb_define_module_function(mCdiLib, "gridDefPrec", _wrap_gridDefPrec, -1);
rb_define_module_function(mCdiLib, "gridInqPrec", _wrap_gridInqPrec, -1);
rb_define_module_function(mCdiLib, "gridDefDatatype", _wrap_gridDefDatatype, -1);
rb_define_module_function(mCdiLib, "gridInqDatatype", _wrap_gridInqDatatype, -1);
rb_define_module_function(mCdiLib, "gridInqXval", _wrap_gridInqXval, -1);
rb_define_module_function(mCdiLib, "gridInqYval", _wrap_gridInqYval, -1);
rb_define_module_function(mCdiLib, "gridInqXinc", _wrap_gridInqXinc, -1);
......@@ -12117,8 +12117,8 @@ SWIGEXPORT void Init_CdiLib(void) {
rb_define_module_function(mCdiLib, "zaxisInqName", _wrap_zaxisInqName, -1);
rb_define_module_function(mCdiLib, "zaxisInqLongname", _wrap_zaxisInqLongname, -1);
rb_define_module_function(mCdiLib, "zaxisInqUnits", _wrap_zaxisInqUnits, -1);
rb_define_module_function(mCdiLib, "zaxisDefPrec", _wrap_zaxisDefPrec, -1);
rb_define_module_function(mCdiLib, "zaxisInqPrec", _wrap_zaxisInqPrec, -1);
rb_define_module_function(mCdiLib, "zaxisDefDatatype", _wrap_zaxisDefDatatype, -1);
rb_define_module_function(mCdiLib, "zaxisInqDatatype", _wrap_zaxisInqDatatype, -1);
rb_define_module_function(mCdiLib, "zaxisDefLtype", _wrap_zaxisDefLtype, -1);
rb_define_module_function(mCdiLib, "zaxisInqLtype", _wrap_zaxisInqLtype, -1);
rb_define_module_function(mCdiLib, "zaxisInqLevelsPtr", _wrap_zaxisInqLevelsPtr, -1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint | Privacy Policy