Skip to content

Commit

Permalink
src: update code for numpy 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexfikl
alexfikl committed Jun 19, 2024
1 parent 86f7b7b commit ceefe4a
Show file tree
Hide file tree
Showing 93 changed files with 364 additions and 364 deletions.
2 changes: 1 addition & 1 deletion src/ccoeffs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/nfweno.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre003002.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre003003.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre004002.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre004004.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre005002.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre005003.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre005004.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/weno_gauss_legendre005005.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading

0 comments on commit ceefe4a

Please sign in to comment.