diff --git a/gen/generate_coeffs.py b/gen/generate_coeffs.py index 4856c2e..ec15c27 100644 --- a/gen/generate_coeffs.py +++ b/gen/generate_coeffs.py @@ -112,14 +112,14 @@ def reconstruction_coeff_functions(k): if (! PyArg_ParseTuple(args, "dliiOO", &xi, &i, &r, &k, &bndry, &coeffs)) return NULL; - if ((PyArray_FLAGS(bndry) & NPY_IN_ARRAY) != NPY_IN_ARRAY) { + if ((PyArray_FLAGS(bndry) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) { PyErr_SetString(PyExc_TypeError, "bndry is not contiguous and/or aligned"); return NULL; } Py_INCREF(bndry); x = (double *) PyArray_DATA(bndry); - if ((PyArray_FLAGS(coeffs) & NPY_IN_ARRAY) != NPY_IN_ARRAY) { + if ((PyArray_FLAGS(coeffs) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) { PyErr_SetString(PyExc_TypeError, "coeffs is not contiguous and/or aligned"); return NULL; } diff --git a/gen/weno_reconstruction.tmpl.c b/gen/weno_reconstruction.tmpl.c index 80979d5..a54a791 100644 --- a/gen/weno_reconstruction.tmpl.c +++ b/gen/weno_reconstruction.tmpl.c @@ -34,12 +34,12 @@ py_weights_{{name}}(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) { + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) { + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "omega must be of type float"); return NULL; } @@ -108,12 +108,12 @@ py_reconstruct_{{name}}(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) { + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) { + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "fr must be of type float"); return NULL; } @@ -123,7 +123,7 @@ py_reconstruct_{{name}}(PyObject *self, PyObject *args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) { + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "omega must be of type float"); return NULL; } diff --git a/gen/weno_smoothness.tmpl.c b/gen/weno_smoothness.tmpl.c index f3c578c..5785b75 100644 --- a/gen/weno_smoothness.tmpl.c +++ b/gen/weno_smoothness.tmpl.c @@ -33,13 +33,13 @@ py_{{name}} (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/pyweno/version.py b/pyweno/version.py index 85e3d80..b510039 100644 --- a/pyweno/version.py +++ b/pyweno/version.py @@ -5,24 +5,18 @@ >>> import pyweno.version >>> pyweno.version.version() >>> pyweno.version.git_version() +""" - """ - -import imp -import os - -def _version(name): - version_file = os.path.join(os.path.dirname(__file__), name + '.py') - version = imp.load_module('pyweno.pyweno.' + name, - open(version_file), - version_file, - ('.py', 'U', 1)) - return version.version def version(): """Return current version.""" - return _version('__version__') + from pyweno.__version__ import version as v + + return v + def git_version(): """Return current *git* version (if available).""" - return _version('__git_version__') + from pyweno.__git_version__ import version as v + + return v diff --git a/setup.py b/setup.py index bdc47b1..bdc14cf 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,8 @@ import os import re -from setuptools import setup, Extension import numpy as np - +from setuptools import setup, Extension ############################################################################### # version @@ -64,6 +63,8 @@ keywords = "weno, interpolate, interpolation, finite, volume", url = "http://readthedocs.org/docs/pyweno/en/latest/", + setup_requires = ["numpy"], + install_requires = ["numpy", "sympy"], ext_modules = [ Extension('pyweno.ccoeffs', sources = ['src/ccoeffs.c'] + glob.glob('src/coeffs*.c'), diff --git a/src/ccoeffs.c b/src/ccoeffs.c index 4c34f86..54a4083 100644 --- a/src/ccoeffs.c +++ b/src/ccoeffs.c @@ -20,7 +20,7 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args) long int i; int r, k; - PyObject *bndry, *coeffs; + PyArrayObject *bndry, *coeffs; /* * parse options @@ -29,7 +29,7 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "dliiOO", &xi, &i, &r, &k, &bndry, &coeffs)) return NULL; - if ((PyArray_FLAGS (bndry) & NPY_IN_ARRAY) != NPY_IN_ARRAY) + if ((PyArray_FLAGS (bndry) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) { PyErr_SetString (PyExc_TypeError, "bndry is not contiguous and/or aligned"); return NULL; @@ -37,7 +37,7 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args) Py_INCREF (bndry); x = (double *) PyArray_DATA (bndry); - if ((PyArray_FLAGS (coeffs) & NPY_IN_ARRAY) != NPY_IN_ARRAY) + if ((PyArray_FLAGS (coeffs) & NPY_ARRAY_IN_ARRAY) != NPY_ARRAY_IN_ARRAY) { PyErr_SetString (PyExc_TypeError, "coeffs is not contiguous and/or aligned"); return NULL; diff --git a/src/nfweno.c b/src/nfweno.c index fb6414a..cfd0b9e 100644 --- a/src/nfweno.c +++ b/src/nfweno.c @@ -261,27 +261,27 @@ PyObject *py_nonuniform_coeffs(PyObject *self, PyObject *args) if (!PyArg_ParseTuple (args, "iOOOOO", &k, &xi_py, &x_py, &c_py, &beta_py, &varpi_py)) return NULL; - if (x_py->nd != 1 || x_py->descr->type_num != PyArray_DOUBLE) { + if (x_py->nd != 1 || x_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "x must be one-dimensional and of type double"); return NULL; } - if (xi_py->nd != 1 || xi_py->descr->type_num != PyArray_DOUBLE) { + if (xi_py->nd != 1 || xi_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "xi must be one-dimensional and of type double"); return NULL; } - if (c_py->nd != 4 || c_py->descr->type_num != PyArray_DOUBLE) { + if (c_py->nd != 4 || c_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "c must be four-dimensional and of type double"); return NULL; } - if (beta_py->nd != 4 || beta_py->descr->type_num != PyArray_DOUBLE) { + if (beta_py->nd != 4 || beta_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "beta must be four-dimensional and of type double"); return NULL; } - if (varpi_py->nd != 3 || varpi_py->descr->type_num != PyArray_DOUBLE) { + if (varpi_py->nd != 3 || varpi_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString(PyExc_ValueError, "varpi must be three-dimensional and of type double"); return NULL; } diff --git a/src/weno_gauss_legendre003002.c b/src/weno_gauss_legendre003002.c index d990e56..531a50b 100644 --- a/src/weno_gauss_legendre003002.c +++ b/src/weno_gauss_legendre003002.c @@ -55,13 +55,13 @@ py_weights_gauss_legendre003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -154,13 +154,13 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -172,7 +172,7 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre003003.c b/src/weno_gauss_legendre003003.c index b112300..12dd0ec 100644 --- a/src/weno_gauss_legendre003003.c +++ b/src/weno_gauss_legendre003003.c @@ -82,13 +82,13 @@ py_weights_gauss_legendre003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -201,13 +201,13 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -219,7 +219,7 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre004002.c b/src/weno_gauss_legendre004002.c index 999747d..a237e71 100644 --- a/src/weno_gauss_legendre004002.c +++ b/src/weno_gauss_legendre004002.c @@ -65,13 +65,13 @@ py_weights_gauss_legendre004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -173,13 +173,13 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -191,7 +191,7 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre004004.c b/src/weno_gauss_legendre004004.c index 60af606..3e2b26f 100644 --- a/src/weno_gauss_legendre004004.c +++ b/src/weno_gauss_legendre004004.c @@ -99,13 +99,13 @@ py_weights_gauss_legendre004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -244,13 +244,13 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -262,7 +262,7 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre005002.c b/src/weno_gauss_legendre005002.c index 4d1e76a..36b0c12 100644 --- a/src/weno_gauss_legendre005002.c +++ b/src/weno_gauss_legendre005002.c @@ -74,13 +74,13 @@ py_weights_gauss_legendre005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -204,13 +204,13 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -222,7 +222,7 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre005003.c b/src/weno_gauss_legendre005003.c index fe2480e..e52df00 100644 --- a/src/weno_gauss_legendre005003.c +++ b/src/weno_gauss_legendre005003.c @@ -127,13 +127,13 @@ py_weights_gauss_legendre005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -295,13 +295,13 @@ py_reconstruct_gauss_legendre005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -313,7 +313,7 @@ py_reconstruct_gauss_legendre005003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre005004.c b/src/weno_gauss_legendre005004.c index 42b1fbf..2297523 100644 --- a/src/weno_gauss_legendre005004.c +++ b/src/weno_gauss_legendre005004.c @@ -117,13 +117,13 @@ py_weights_gauss_legendre005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -307,13 +307,13 @@ py_reconstruct_gauss_legendre005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -325,7 +325,7 @@ py_reconstruct_gauss_legendre005004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre005005.c b/src/weno_gauss_legendre005005.c index f0e4b53..9da8dbb 100644 --- a/src/weno_gauss_legendre005005.c +++ b/src/weno_gauss_legendre005005.c @@ -170,13 +170,13 @@ py_weights_gauss_legendre005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -400,13 +400,13 @@ py_reconstruct_gauss_legendre005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -418,7 +418,7 @@ py_reconstruct_gauss_legendre005005 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre006002.c b/src/weno_gauss_legendre006002.c index 3fd41c2..dc2c00f 100644 --- a/src/weno_gauss_legendre006002.c +++ b/src/weno_gauss_legendre006002.c @@ -83,13 +83,13 @@ py_weights_gauss_legendre006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -223,13 +223,13 @@ py_reconstruct_gauss_legendre006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -241,7 +241,7 @@ py_reconstruct_gauss_legendre006002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre006004.c b/src/weno_gauss_legendre006004.c index cb12919..c36c7bb 100644 --- a/src/weno_gauss_legendre006004.c +++ b/src/weno_gauss_legendre006004.c @@ -134,13 +134,13 @@ py_weights_gauss_legendre006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -344,13 +344,13 @@ py_reconstruct_gauss_legendre006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -362,7 +362,7 @@ py_reconstruct_gauss_legendre006004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre006006.c b/src/weno_gauss_legendre006006.c index eee5179..b576ea4 100644 --- a/src/weno_gauss_legendre006006.c +++ b/src/weno_gauss_legendre006006.c @@ -261,13 +261,13 @@ py_weights_gauss_legendre006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -563,13 +563,13 @@ py_reconstruct_gauss_legendre006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -581,7 +581,7 @@ py_reconstruct_gauss_legendre006006 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_legendre007002.c b/src/weno_gauss_legendre007002.c index 9e5ddcb..b9c6aa6 100644 --- a/src/weno_gauss_legendre007002.c +++ b/src/weno_gauss_legendre007002.c @@ -158,13 +158,13 @@ py_gauss_legendre007002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -176,7 +176,7 @@ py_gauss_legendre007002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre007003.c b/src/weno_gauss_legendre007003.c index b3ade98..22851d1 100644 --- a/src/weno_gauss_legendre007003.c +++ b/src/weno_gauss_legendre007003.c @@ -245,13 +245,13 @@ py_gauss_legendre007003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -263,7 +263,7 @@ py_gauss_legendre007003 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre007004.c b/src/weno_gauss_legendre007004.c index e26c3aa..42e0f39 100644 --- a/src/weno_gauss_legendre007004.c +++ b/src/weno_gauss_legendre007004.c @@ -332,13 +332,13 @@ py_gauss_legendre007004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -350,7 +350,7 @@ py_gauss_legendre007004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre007005.c b/src/weno_gauss_legendre007005.c index feba324..51c9c6f 100644 --- a/src/weno_gauss_legendre007005.c +++ b/src/weno_gauss_legendre007005.c @@ -369,13 +369,13 @@ py_gauss_legendre007005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -387,7 +387,7 @@ py_gauss_legendre007005 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre007006.c b/src/weno_gauss_legendre007006.c index 638316d..767837d 100644 --- a/src/weno_gauss_legendre007006.c +++ b/src/weno_gauss_legendre007006.c @@ -456,13 +456,13 @@ py_gauss_legendre007006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -474,7 +474,7 @@ py_gauss_legendre007006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre007007.c b/src/weno_gauss_legendre007007.c index dc39243..498a284 100644 --- a/src/weno_gauss_legendre007007.c +++ b/src/weno_gauss_legendre007007.c @@ -494,13 +494,13 @@ py_gauss_legendre007007 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -512,7 +512,7 @@ py_gauss_legendre007007 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre008002.c b/src/weno_gauss_legendre008002.c index e3050f5..835a0e9 100644 --- a/src/weno_gauss_legendre008002.c +++ b/src/weno_gauss_legendre008002.c @@ -176,13 +176,13 @@ py_gauss_legendre008002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -194,7 +194,7 @@ py_gauss_legendre008002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre008004.c b/src/weno_gauss_legendre008004.c index df938e4..2f60918 100644 --- a/src/weno_gauss_legendre008004.c +++ b/src/weno_gauss_legendre008004.c @@ -372,13 +372,13 @@ py_gauss_legendre008004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -390,7 +390,7 @@ py_gauss_legendre008004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre008006.c b/src/weno_gauss_legendre008006.c index d5bd3b2..8fee74b 100644 --- a/src/weno_gauss_legendre008006.c +++ b/src/weno_gauss_legendre008006.c @@ -512,13 +512,13 @@ py_gauss_legendre008006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -530,7 +530,7 @@ py_gauss_legendre008006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_legendre008008.c b/src/weno_gauss_legendre008008.c index b88d0bd..75f4ae3 100644 --- a/src/weno_gauss_legendre008008.c +++ b/src/weno_gauss_legendre008008.c @@ -653,13 +653,13 @@ py_gauss_legendre008008 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -671,7 +671,7 @@ py_gauss_legendre008008 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto003002.c b/src/weno_gauss_lobatto003002.c index 5b39cca..4dcee5b 100644 --- a/src/weno_gauss_lobatto003002.c +++ b/src/weno_gauss_lobatto003002.c @@ -55,13 +55,13 @@ py_weights_gauss_lobatto003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -154,13 +154,13 @@ py_reconstruct_gauss_lobatto003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -172,7 +172,7 @@ py_reconstruct_gauss_lobatto003002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto003003.c b/src/weno_gauss_lobatto003003.c index 6f1a44e..cb51e1e 100644 --- a/src/weno_gauss_lobatto003003.c +++ b/src/weno_gauss_lobatto003003.c @@ -82,13 +82,13 @@ py_weights_gauss_lobatto003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -201,13 +201,13 @@ py_reconstruct_gauss_lobatto003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -219,7 +219,7 @@ py_reconstruct_gauss_lobatto003003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto004002.c b/src/weno_gauss_lobatto004002.c index 01c7b99..8520340 100644 --- a/src/weno_gauss_lobatto004002.c +++ b/src/weno_gauss_lobatto004002.c @@ -65,13 +65,13 @@ py_weights_gauss_lobatto004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -173,13 +173,13 @@ py_reconstruct_gauss_lobatto004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -191,7 +191,7 @@ py_reconstruct_gauss_lobatto004002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto004004.c b/src/weno_gauss_lobatto004004.c index 1a53942..7faf324 100644 --- a/src/weno_gauss_lobatto004004.c +++ b/src/weno_gauss_lobatto004004.c @@ -99,13 +99,13 @@ py_weights_gauss_lobatto004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -244,13 +244,13 @@ py_reconstruct_gauss_lobatto004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -262,7 +262,7 @@ py_reconstruct_gauss_lobatto004004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto005002.c b/src/weno_gauss_lobatto005002.c index 308b5ca..da6e43e 100644 --- a/src/weno_gauss_lobatto005002.c +++ b/src/weno_gauss_lobatto005002.c @@ -74,13 +74,13 @@ py_weights_gauss_lobatto005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -204,13 +204,13 @@ py_reconstruct_gauss_lobatto005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -222,7 +222,7 @@ py_reconstruct_gauss_lobatto005002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto005003.c b/src/weno_gauss_lobatto005003.c index 063c5b1..43e8071 100644 --- a/src/weno_gauss_lobatto005003.c +++ b/src/weno_gauss_lobatto005003.c @@ -127,13 +127,13 @@ py_weights_gauss_lobatto005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -295,13 +295,13 @@ py_reconstruct_gauss_lobatto005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -313,7 +313,7 @@ py_reconstruct_gauss_lobatto005003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto005004.c b/src/weno_gauss_lobatto005004.c index 2cb258f..b05490c 100644 --- a/src/weno_gauss_lobatto005004.c +++ b/src/weno_gauss_lobatto005004.c @@ -117,13 +117,13 @@ py_weights_gauss_lobatto005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -307,13 +307,13 @@ py_reconstruct_gauss_lobatto005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -325,7 +325,7 @@ py_reconstruct_gauss_lobatto005004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto005005.c b/src/weno_gauss_lobatto005005.c index a385e22..2f44f4a 100644 --- a/src/weno_gauss_lobatto005005.c +++ b/src/weno_gauss_lobatto005005.c @@ -170,13 +170,13 @@ py_weights_gauss_lobatto005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -400,13 +400,13 @@ py_reconstruct_gauss_lobatto005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -418,7 +418,7 @@ py_reconstruct_gauss_lobatto005005 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto006002.c b/src/weno_gauss_lobatto006002.c index 049f170..cc8434e 100644 --- a/src/weno_gauss_lobatto006002.c +++ b/src/weno_gauss_lobatto006002.c @@ -83,13 +83,13 @@ py_weights_gauss_lobatto006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -223,13 +223,13 @@ py_reconstruct_gauss_lobatto006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -241,7 +241,7 @@ py_reconstruct_gauss_lobatto006002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto006004.c b/src/weno_gauss_lobatto006004.c index 9384e21..b56b925 100644 --- a/src/weno_gauss_lobatto006004.c +++ b/src/weno_gauss_lobatto006004.c @@ -134,13 +134,13 @@ py_weights_gauss_lobatto006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -344,13 +344,13 @@ py_reconstruct_gauss_lobatto006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -362,7 +362,7 @@ py_reconstruct_gauss_lobatto006004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto006006.c b/src/weno_gauss_lobatto006006.c index c04b4cb..74fae88 100644 --- a/src/weno_gauss_lobatto006006.c +++ b/src/weno_gauss_lobatto006006.c @@ -261,13 +261,13 @@ py_weights_gauss_lobatto006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -566,13 +566,13 @@ py_reconstruct_gauss_lobatto006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -584,7 +584,7 @@ py_reconstruct_gauss_lobatto006006 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007002.c b/src/weno_gauss_lobatto007002.c index 63dd66a..bb61616 100644 --- a/src/weno_gauss_lobatto007002.c +++ b/src/weno_gauss_lobatto007002.c @@ -158,13 +158,13 @@ py_gauss_lobatto007002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -176,7 +176,7 @@ py_gauss_lobatto007002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007003.c b/src/weno_gauss_lobatto007003.c index 9293b54..cf3d8af 100644 --- a/src/weno_gauss_lobatto007003.c +++ b/src/weno_gauss_lobatto007003.c @@ -245,13 +245,13 @@ py_gauss_lobatto007003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -263,7 +263,7 @@ py_gauss_lobatto007003 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007004.c b/src/weno_gauss_lobatto007004.c index 63fab02..805c003 100644 --- a/src/weno_gauss_lobatto007004.c +++ b/src/weno_gauss_lobatto007004.c @@ -282,13 +282,13 @@ py_gauss_lobatto007004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -300,7 +300,7 @@ py_gauss_lobatto007004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007005.c b/src/weno_gauss_lobatto007005.c index 11e7fa6..2e691de 100644 --- a/src/weno_gauss_lobatto007005.c +++ b/src/weno_gauss_lobatto007005.c @@ -369,13 +369,13 @@ py_gauss_lobatto007005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -387,7 +387,7 @@ py_gauss_lobatto007005 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007006.c b/src/weno_gauss_lobatto007006.c index 086e9a4..b660a61 100644 --- a/src/weno_gauss_lobatto007006.c +++ b/src/weno_gauss_lobatto007006.c @@ -456,13 +456,13 @@ py_gauss_lobatto007006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -474,7 +474,7 @@ py_gauss_lobatto007006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto007007.c b/src/weno_gauss_lobatto007007.c index 9711c63..89dd97b 100644 --- a/src/weno_gauss_lobatto007007.c +++ b/src/weno_gauss_lobatto007007.c @@ -494,13 +494,13 @@ py_gauss_lobatto007007 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -512,7 +512,7 @@ py_gauss_lobatto007007 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto008002.c b/src/weno_gauss_lobatto008002.c index 5d760fd..da4ef86 100644 --- a/src/weno_gauss_lobatto008002.c +++ b/src/weno_gauss_lobatto008002.c @@ -176,13 +176,13 @@ py_gauss_lobatto008002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -194,7 +194,7 @@ py_gauss_lobatto008002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto008004.c b/src/weno_gauss_lobatto008004.c index 50b09d9..cc4afa5 100644 --- a/src/weno_gauss_lobatto008004.c +++ b/src/weno_gauss_lobatto008004.c @@ -316,13 +316,13 @@ py_gauss_lobatto008004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -334,7 +334,7 @@ py_gauss_lobatto008004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto008006.c b/src/weno_gauss_lobatto008006.c index cfb4dde..6edc24d 100644 --- a/src/weno_gauss_lobatto008006.c +++ b/src/weno_gauss_lobatto008006.c @@ -512,13 +512,13 @@ py_gauss_lobatto008006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -530,7 +530,7 @@ py_gauss_lobatto008006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_lobatto008008.c b/src/weno_gauss_lobatto008008.c index 16bc117..0827555 100644 --- a/src/weno_gauss_lobatto008008.c +++ b/src/weno_gauss_lobatto008008.c @@ -653,13 +653,13 @@ py_gauss_lobatto008008 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -671,7 +671,7 @@ py_gauss_lobatto008008 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau003002.c b/src/weno_gauss_radau003002.c index cea5544..f8914ba 100644 --- a/src/weno_gauss_radau003002.c +++ b/src/weno_gauss_radau003002.c @@ -55,13 +55,13 @@ py_weights_gauss_radau003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -154,13 +154,13 @@ py_reconstruct_gauss_radau003002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -172,7 +172,7 @@ py_reconstruct_gauss_radau003002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau003003.c b/src/weno_gauss_radau003003.c index cda7c62..688949b 100644 --- a/src/weno_gauss_radau003003.c +++ b/src/weno_gauss_radau003003.c @@ -69,13 +69,13 @@ py_weights_gauss_radau003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -183,13 +183,13 @@ py_reconstruct_gauss_radau003003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -201,7 +201,7 @@ py_reconstruct_gauss_radau003003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau004002.c b/src/weno_gauss_radau004002.c index 10cbf2f..312c5cb 100644 --- a/src/weno_gauss_radau004002.c +++ b/src/weno_gauss_radau004002.c @@ -65,13 +65,13 @@ py_weights_gauss_radau004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -173,13 +173,13 @@ py_reconstruct_gauss_radau004002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -191,7 +191,7 @@ py_reconstruct_gauss_radau004002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau004003.c b/src/weno_gauss_radau004003.c index 494a710..d3c6835 100644 --- a/src/weno_gauss_radau004003.c +++ b/src/weno_gauss_radau004003.c @@ -82,13 +82,13 @@ py_weights_gauss_radau004003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -208,13 +208,13 @@ py_reconstruct_gauss_radau004003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -226,7 +226,7 @@ py_reconstruct_gauss_radau004003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau004004.c b/src/weno_gauss_radau004004.c index decfc95..a2e68b0 100644 --- a/src/weno_gauss_radau004004.c +++ b/src/weno_gauss_radau004004.c @@ -125,13 +125,13 @@ py_weights_gauss_radau004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -279,13 +279,13 @@ py_reconstruct_gauss_radau004004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -297,7 +297,7 @@ py_reconstruct_gauss_radau004004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau005002.c b/src/weno_gauss_radau005002.c index de1a823..5675a0f 100644 --- a/src/weno_gauss_radau005002.c +++ b/src/weno_gauss_radau005002.c @@ -74,13 +74,13 @@ py_weights_gauss_radau005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -204,13 +204,13 @@ py_reconstruct_gauss_radau005002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -222,7 +222,7 @@ py_reconstruct_gauss_radau005002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau005003.c b/src/weno_gauss_radau005003.c index 3cd12da..83c0481 100644 --- a/src/weno_gauss_radau005003.c +++ b/src/weno_gauss_radau005003.c @@ -127,13 +127,13 @@ py_weights_gauss_radau005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -295,13 +295,13 @@ py_reconstruct_gauss_radau005003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -313,7 +313,7 @@ py_reconstruct_gauss_radau005003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau005004.c b/src/weno_gauss_radau005004.c index fa47392..f168dcf 100644 --- a/src/weno_gauss_radau005004.c +++ b/src/weno_gauss_radau005004.c @@ -148,13 +148,13 @@ py_weights_gauss_radau005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -348,13 +348,13 @@ py_reconstruct_gauss_radau005004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -366,7 +366,7 @@ py_reconstruct_gauss_radau005004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau005005.c b/src/weno_gauss_radau005005.c index 267f298..a5bdfdd 100644 --- a/src/weno_gauss_radau005005.c +++ b/src/weno_gauss_radau005005.c @@ -170,13 +170,13 @@ py_weights_gauss_radau005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -400,13 +400,13 @@ py_reconstruct_gauss_radau005005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -418,7 +418,7 @@ py_reconstruct_gauss_radau005005 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau006002.c b/src/weno_gauss_radau006002.c index e15eadb..d25cd22 100644 --- a/src/weno_gauss_radau006002.c +++ b/src/weno_gauss_radau006002.c @@ -121,13 +121,13 @@ py_weights_gauss_radau006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -276,13 +276,13 @@ py_reconstruct_gauss_radau006002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -294,7 +294,7 @@ py_reconstruct_gauss_radau006002 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau006003.c b/src/weno_gauss_radau006003.c index b909ff1..38335df 100644 --- a/src/weno_gauss_radau006003.c +++ b/src/weno_gauss_radau006003.c @@ -146,13 +146,13 @@ py_weights_gauss_radau006003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -336,13 +336,13 @@ py_reconstruct_gauss_radau006003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -354,7 +354,7 @@ py_reconstruct_gauss_radau006003 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau006004.c b/src/weno_gauss_radau006004.c index 2b9d865..7a9a43a 100644 --- a/src/weno_gauss_radau006004.c +++ b/src/weno_gauss_radau006004.c @@ -172,13 +172,13 @@ py_weights_gauss_radau006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -393,13 +393,13 @@ py_reconstruct_gauss_radau006004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -411,7 +411,7 @@ py_reconstruct_gauss_radau006004 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau006005.c b/src/weno_gauss_radau006005.c index 086470c..471adab 100644 --- a/src/weno_gauss_radau006005.c +++ b/src/weno_gauss_radau006005.c @@ -198,13 +198,13 @@ py_weights_gauss_radau006005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -454,13 +454,13 @@ py_reconstruct_gauss_radau006005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -472,7 +472,7 @@ py_reconstruct_gauss_radau006005 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau006006.c b/src/weno_gauss_radau006006.c index 4549740..4bfc7c2 100644 --- a/src/weno_gauss_radau006006.c +++ b/src/weno_gauss_radau006006.c @@ -223,13 +223,13 @@ py_weights_gauss_radau006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -514,13 +514,13 @@ py_reconstruct_gauss_radau006006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -532,7 +532,7 @@ py_reconstruct_gauss_radau006006 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_gauss_radau007002.c b/src/weno_gauss_radau007002.c index 59135a0..f7f4489 100644 --- a/src/weno_gauss_radau007002.c +++ b/src/weno_gauss_radau007002.c @@ -183,13 +183,13 @@ py_gauss_radau007002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -201,7 +201,7 @@ py_gauss_radau007002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau007003.c b/src/weno_gauss_radau007003.c index 79cd1ec..8cff24e 100644 --- a/src/weno_gauss_radau007003.c +++ b/src/weno_gauss_radau007003.c @@ -245,13 +245,13 @@ py_gauss_radau007003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -263,7 +263,7 @@ py_gauss_radau007003 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau007004.c b/src/weno_gauss_radau007004.c index e7373eb..be4c10f 100644 --- a/src/weno_gauss_radau007004.c +++ b/src/weno_gauss_radau007004.c @@ -307,13 +307,13 @@ py_gauss_radau007004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -325,7 +325,7 @@ py_gauss_radau007004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau007005.c b/src/weno_gauss_radau007005.c index 427492b..ee8eff0 100644 --- a/src/weno_gauss_radau007005.c +++ b/src/weno_gauss_radau007005.c @@ -369,13 +369,13 @@ py_gauss_radau007005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -387,7 +387,7 @@ py_gauss_radau007005 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau007006.c b/src/weno_gauss_radau007006.c index c62354e..1781094 100644 --- a/src/weno_gauss_radau007006.c +++ b/src/weno_gauss_radau007006.c @@ -432,13 +432,13 @@ py_gauss_radau007006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -450,7 +450,7 @@ py_gauss_radau007006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau007007.c b/src/weno_gauss_radau007007.c index 52719ab..06b4ee9 100644 --- a/src/weno_gauss_radau007007.c +++ b/src/weno_gauss_radau007007.c @@ -518,13 +518,13 @@ py_gauss_radau007007 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -536,7 +536,7 @@ py_gauss_radau007007 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008002.c b/src/weno_gauss_radau008002.c index bcdd98e..cb975af 100644 --- a/src/weno_gauss_radau008002.c +++ b/src/weno_gauss_radau008002.c @@ -204,13 +204,13 @@ py_gauss_radau008002 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -222,7 +222,7 @@ py_gauss_radau008002 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008003.c b/src/weno_gauss_radau008003.c index 64a8f8c..5fed1e0 100644 --- a/src/weno_gauss_radau008003.c +++ b/src/weno_gauss_radau008003.c @@ -274,13 +274,13 @@ py_gauss_radau008003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -292,7 +292,7 @@ py_gauss_radau008003 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008004.c b/src/weno_gauss_radau008004.c index 9400181..4c8d365 100644 --- a/src/weno_gauss_radau008004.c +++ b/src/weno_gauss_radau008004.c @@ -344,13 +344,13 @@ py_gauss_radau008004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -362,7 +362,7 @@ py_gauss_radau008004 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008005.c b/src/weno_gauss_radau008005.c index 0a42512..54c249a 100644 --- a/src/weno_gauss_radau008005.c +++ b/src/weno_gauss_radau008005.c @@ -414,13 +414,13 @@ py_gauss_radau008005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -432,7 +432,7 @@ py_gauss_radau008005 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008006.c b/src/weno_gauss_radau008006.c index 13de183..a55ea87 100644 --- a/src/weno_gauss_radau008006.c +++ b/src/weno_gauss_radau008006.c @@ -485,13 +485,13 @@ py_gauss_radau008006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -503,7 +503,7 @@ py_gauss_radau008006 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008007.c b/src/weno_gauss_radau008007.c index 494c9c0..6ff9634 100644 --- a/src/weno_gauss_radau008007.c +++ b/src/weno_gauss_radau008007.c @@ -583,13 +583,13 @@ py_gauss_radau008007 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -601,7 +601,7 @@ py_gauss_radau008007 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_gauss_radau008008.c b/src/weno_gauss_radau008008.c index c9938e6..490e5ad 100644 --- a/src/weno_gauss_radau008008.c +++ b/src/weno_gauss_radau008008.c @@ -653,13 +653,13 @@ py_gauss_radau008008 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -671,7 +671,7 @@ py_gauss_radau008008 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_left003001.c b/src/weno_left003001.c index ba95839..8fabbe2 100644 --- a/src/weno_left003001.c +++ b/src/weno_left003001.c @@ -42,13 +42,13 @@ py_weights_left003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -127,13 +127,13 @@ py_reconstruct_left003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -145,7 +145,7 @@ py_reconstruct_left003001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_left004001.c b/src/weno_left004001.c index fe3848d..b80c414 100644 --- a/src/weno_left004001.c +++ b/src/weno_left004001.c @@ -47,13 +47,13 @@ py_weights_left004001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -136,13 +136,13 @@ py_reconstruct_left004001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -154,7 +154,7 @@ py_reconstruct_left004001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_left005001.c b/src/weno_left005001.c index 9a3501c..3ed5a76 100644 --- a/src/weno_left005001.c +++ b/src/weno_left005001.c @@ -52,13 +52,13 @@ py_weights_left005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -152,13 +152,13 @@ py_reconstruct_left005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -170,7 +170,7 @@ py_reconstruct_left005001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_left006001.c b/src/weno_left006001.c index f62e76a..e7f7ae5 100644 --- a/src/weno_left006001.c +++ b/src/weno_left006001.c @@ -58,13 +58,13 @@ py_weights_left006001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -163,13 +163,13 @@ py_reconstruct_left006001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -181,7 +181,7 @@ py_reconstruct_left006001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_left007001.c b/src/weno_left007001.c index 0f46734..4c9b86c 100644 --- a/src/weno_left007001.c +++ b/src/weno_left007001.c @@ -95,13 +95,13 @@ py_left007001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -113,7 +113,7 @@ py_left007001 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_left008001.c b/src/weno_left008001.c index 15c6a26..ce5d38c 100644 --- a/src/weno_left008001.c +++ b/src/weno_left008001.c @@ -104,13 +104,13 @@ py_left008001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -122,7 +122,7 @@ py_left008001 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_middle003001.c b/src/weno_middle003001.c index 00b2622..69269eb 100644 --- a/src/weno_middle003001.c +++ b/src/weno_middle003001.c @@ -55,13 +55,13 @@ py_weights_middle003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -145,13 +145,13 @@ py_reconstruct_middle003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -163,7 +163,7 @@ py_reconstruct_middle003001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_middle005001.c b/src/weno_middle005001.c index 1963c0e..d220841 100644 --- a/src/weno_middle005001.c +++ b/src/weno_middle005001.c @@ -84,13 +84,13 @@ py_weights_middle005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -193,13 +193,13 @@ py_reconstruct_middle005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -211,7 +211,7 @@ py_reconstruct_middle005001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_middle007001.c b/src/weno_middle007001.c index 6bb0676..f99cdb3 100644 --- a/src/weno_middle007001.c +++ b/src/weno_middle007001.c @@ -121,13 +121,13 @@ py_middle007001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -139,7 +139,7 @@ py_middle007001 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_right003001.c b/src/weno_right003001.c index 9111d6d..058d26a 100644 --- a/src/weno_right003001.c +++ b/src/weno_right003001.c @@ -42,13 +42,13 @@ py_weights_right003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -127,13 +127,13 @@ py_reconstruct_right003001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -145,7 +145,7 @@ py_reconstruct_right003001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_right004001.c b/src/weno_right004001.c index c09e1b8..dcd4aa7 100644 --- a/src/weno_right004001.c +++ b/src/weno_right004001.c @@ -47,13 +47,13 @@ py_weights_right004001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -136,13 +136,13 @@ py_reconstruct_right004001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -154,7 +154,7 @@ py_reconstruct_right004001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_right005001.c b/src/weno_right005001.c index 1017e84..85f98e8 100644 --- a/src/weno_right005001.c +++ b/src/weno_right005001.c @@ -52,13 +52,13 @@ py_weights_right005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -152,13 +152,13 @@ py_reconstruct_right005001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -170,7 +170,7 @@ py_reconstruct_right005001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_right006001.c b/src/weno_right006001.c index fc3c568..e83124a 100644 --- a/src/weno_right006001.c +++ b/src/weno_right006001.c @@ -58,13 +58,13 @@ py_weights_right006001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; @@ -163,13 +163,13 @@ py_reconstruct_right006001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -181,7 +181,7 @@ py_reconstruct_right006001 (PyObject * self, PyObject * args) return NULL; } - if (omega_py->descr->type_num != PyArray_DOUBLE) + if (omega_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "omega must be of type float"); return NULL; diff --git a/src/weno_right007001.c b/src/weno_right007001.c index d4261fb..e25dae0 100644 --- a/src/weno_right007001.c +++ b/src/weno_right007001.c @@ -96,13 +96,13 @@ py_right007001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -114,7 +114,7 @@ py_right007001 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_right008001.c b/src/weno_right008001.c index 9d30600..a988a35 100644 --- a/src/weno_right008001.c +++ b/src/weno_right008001.c @@ -105,13 +105,13 @@ py_right008001 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OOO", &f_py, &sigma_py, &fr_py)) return NULL; - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; } - if (fr_py->descr->type_num != PyArray_DOUBLE) + if (fr_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "fr must be of type float"); return NULL; @@ -123,7 +123,7 @@ py_right008001 (PyObject * self, PyObject * args) return NULL; } - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness003.c b/src/weno_smoothness003.c index 7a2e306..7743e34 100644 --- a/src/weno_smoothness003.c +++ b/src/weno_smoothness003.c @@ -49,13 +49,13 @@ py_smoothness003 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness004.c b/src/weno_smoothness004.c index 3ee946b..33d7c13 100644 --- a/src/weno_smoothness004.c +++ b/src/weno_smoothness004.c @@ -73,13 +73,13 @@ py_smoothness004 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness005.c b/src/weno_smoothness005.c index 101e4ba..99cf6fe 100644 --- a/src/weno_smoothness005.c +++ b/src/weno_smoothness005.c @@ -110,13 +110,13 @@ py_smoothness005 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness006.c b/src/weno_smoothness006.c index 92ed599..6429566 100644 --- a/src/weno_smoothness006.c +++ b/src/weno_smoothness006.c @@ -163,13 +163,13 @@ py_smoothness006 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness007.c b/src/weno_smoothness007.c index 6b0db75..aabdd6a 100644 --- a/src/weno_smoothness007.c +++ b/src/weno_smoothness007.c @@ -235,13 +235,13 @@ py_smoothness007 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness008.c b/src/weno_smoothness008.c index 54101d2..b4b8ce0 100644 --- a/src/weno_smoothness008.c +++ b/src/weno_smoothness008.c @@ -329,13 +329,13 @@ py_smoothness008 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL; diff --git a/src/weno_smoothness009.c b/src/weno_smoothness009.c index 7f313e9..d4c5a03 100644 --- a/src/weno_smoothness009.c +++ b/src/weno_smoothness009.c @@ -448,13 +448,13 @@ py_smoothness009 (PyObject * self, PyObject * args) if (!PyArg_ParseTuple (args, "OO", &f_py, &sigma_py)) return NULL; - if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE) + if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float"); return NULL; } - if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE) + if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE) { PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float"); return NULL;