Skip to content

Commit aa4e2ed

Browse files
alexfiklalexfikl
committed
src: update code for numpy 2.0
1 parent def73f7 commit aa4e2ed

93 files changed

Lines changed: 364 additions & 364 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/ccoeffs.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ reconstruction_coeffs_py (PyObject * self, PyObject * args)
2020
long int i;
2121
int r, k;
2222

23-
PyObject *bndry, *coeffs;
23+
PyArrayObject *bndry, *coeffs;
2424

2525
/*
2626
* parse options

‎src/nfweno.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,27 +261,27 @@ PyObject *py_nonuniform_coeffs(PyObject *self, PyObject *args)
261261
if (!PyArg_ParseTuple (args, "iOOOOO", &k, &xi_py, &x_py, &c_py, &beta_py, &varpi_py))
262262
return NULL;
263263

264-
if (x_py->nd != 1 || x_py->descr->type_num != PyArray_DOUBLE) {
264+
if (x_py->nd != 1 || x_py->descr->type_num != NPY_DOUBLE) {
265265
PyErr_SetString(PyExc_ValueError, "x must be one-dimensional and of type double");
266266
return NULL;
267267
}
268268

269-
if (xi_py->nd != 1 || xi_py->descr->type_num != PyArray_DOUBLE) {
269+
if (xi_py->nd != 1 || xi_py->descr->type_num != NPY_DOUBLE) {
270270
PyErr_SetString(PyExc_ValueError, "xi must be one-dimensional and of type double");
271271
return NULL;
272272
}
273273

274-
if (c_py->nd != 4 || c_py->descr->type_num != PyArray_DOUBLE) {
274+
if (c_py->nd != 4 || c_py->descr->type_num != NPY_DOUBLE) {
275275
PyErr_SetString(PyExc_ValueError, "c must be four-dimensional and of type double");
276276
return NULL;
277277
}
278278

279-
if (beta_py->nd != 4 || beta_py->descr->type_num != PyArray_DOUBLE) {
279+
if (beta_py->nd != 4 || beta_py->descr->type_num != NPY_DOUBLE) {
280280
PyErr_SetString(PyExc_ValueError, "beta must be four-dimensional and of type double");
281281
return NULL;
282282
}
283283

284-
if (varpi_py->nd != 3 || varpi_py->descr->type_num != PyArray_DOUBLE) {
284+
if (varpi_py->nd != 3 || varpi_py->descr->type_num != NPY_DOUBLE) {
285285
PyErr_SetString(PyExc_ValueError, "varpi must be three-dimensional and of type double");
286286
return NULL;
287287
}

‎src/weno_gauss_legendre003002.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ py_weights_gauss_legendre003002 (PyObject * self, PyObject * args)
5555
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
5656
return NULL;
5757

58-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
58+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
5959
{
6060
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
6161
return NULL;
6262
}
6363

64-
if (omega_py->descr->type_num != PyArray_DOUBLE)
64+
if (omega_py->descr->type_num != NPY_DOUBLE)
6565
{
6666
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
6767
return NULL;
@@ -154,13 +154,13 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args)
154154
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
155155
return NULL;
156156

157-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
157+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
158158
{
159159
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
160160
return NULL;
161161
}
162162

163-
if (fr_py->descr->type_num != PyArray_DOUBLE)
163+
if (fr_py->descr->type_num != NPY_DOUBLE)
164164
{
165165
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
166166
return NULL;
@@ -172,7 +172,7 @@ py_reconstruct_gauss_legendre003002 (PyObject * self, PyObject * args)
172172
return NULL;
173173
}
174174

175-
if (omega_py->descr->type_num != PyArray_DOUBLE)
175+
if (omega_py->descr->type_num != NPY_DOUBLE)
176176
{
177177
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
178178
return NULL;

‎src/weno_gauss_legendre003003.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ py_weights_gauss_legendre003003 (PyObject * self, PyObject * args)
8282
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
8383
return NULL;
8484

85-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
85+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
8686
{
8787
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
8888
return NULL;
8989
}
9090

91-
if (omega_py->descr->type_num != PyArray_DOUBLE)
91+
if (omega_py->descr->type_num != NPY_DOUBLE)
9292
{
9393
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
9494
return NULL;
@@ -201,13 +201,13 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args)
201201
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
202202
return NULL;
203203

204-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
204+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
205205
{
206206
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
207207
return NULL;
208208
}
209209

210-
if (fr_py->descr->type_num != PyArray_DOUBLE)
210+
if (fr_py->descr->type_num != NPY_DOUBLE)
211211
{
212212
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
213213
return NULL;
@@ -219,7 +219,7 @@ py_reconstruct_gauss_legendre003003 (PyObject * self, PyObject * args)
219219
return NULL;
220220
}
221221

222-
if (omega_py->descr->type_num != PyArray_DOUBLE)
222+
if (omega_py->descr->type_num != NPY_DOUBLE)
223223
{
224224
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
225225
return NULL;

‎src/weno_gauss_legendre004002.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ py_weights_gauss_legendre004002 (PyObject * self, PyObject * args)
6565
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
6666
return NULL;
6767

68-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
68+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
6969
{
7070
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
7171
return NULL;
7272
}
7373

74-
if (omega_py->descr->type_num != PyArray_DOUBLE)
74+
if (omega_py->descr->type_num != NPY_DOUBLE)
7575
{
7676
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
7777
return NULL;
@@ -173,13 +173,13 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args)
173173
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
174174
return NULL;
175175

176-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
176+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
177177
{
178178
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
179179
return NULL;
180180
}
181181

182-
if (fr_py->descr->type_num != PyArray_DOUBLE)
182+
if (fr_py->descr->type_num != NPY_DOUBLE)
183183
{
184184
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
185185
return NULL;
@@ -191,7 +191,7 @@ py_reconstruct_gauss_legendre004002 (PyObject * self, PyObject * args)
191191
return NULL;
192192
}
193193

194-
if (omega_py->descr->type_num != PyArray_DOUBLE)
194+
if (omega_py->descr->type_num != NPY_DOUBLE)
195195
{
196196
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
197197
return NULL;

‎src/weno_gauss_legendre004004.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ py_weights_gauss_legendre004004 (PyObject * self, PyObject * args)
9999
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
100100
return NULL;
101101

102-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
102+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
103103
{
104104
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
105105
return NULL;
106106
}
107107

108-
if (omega_py->descr->type_num != PyArray_DOUBLE)
108+
if (omega_py->descr->type_num != NPY_DOUBLE)
109109
{
110110
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
111111
return NULL;
@@ -244,13 +244,13 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args)
244244
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
245245
return NULL;
246246

247-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
247+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
248248
{
249249
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
250250
return NULL;
251251
}
252252

253-
if (fr_py->descr->type_num != PyArray_DOUBLE)
253+
if (fr_py->descr->type_num != NPY_DOUBLE)
254254
{
255255
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
256256
return NULL;
@@ -262,7 +262,7 @@ py_reconstruct_gauss_legendre004004 (PyObject * self, PyObject * args)
262262
return NULL;
263263
}
264264

265-
if (omega_py->descr->type_num != PyArray_DOUBLE)
265+
if (omega_py->descr->type_num != NPY_DOUBLE)
266266
{
267267
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
268268
return NULL;

‎src/weno_gauss_legendre005002.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ py_weights_gauss_legendre005002 (PyObject * self, PyObject * args)
7474
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
7575
return NULL;
7676

77-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
77+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
7878
{
7979
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
8080
return NULL;
8181
}
8282

83-
if (omega_py->descr->type_num != PyArray_DOUBLE)
83+
if (omega_py->descr->type_num != NPY_DOUBLE)
8484
{
8585
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
8686
return NULL;
@@ -204,13 +204,13 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args)
204204
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
205205
return NULL;
206206

207-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
207+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
208208
{
209209
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
210210
return NULL;
211211
}
212212

213-
if (fr_py->descr->type_num != PyArray_DOUBLE)
213+
if (fr_py->descr->type_num != NPY_DOUBLE)
214214
{
215215
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
216216
return NULL;
@@ -222,7 +222,7 @@ py_reconstruct_gauss_legendre005002 (PyObject * self, PyObject * args)
222222
return NULL;
223223
}
224224

225-
if (omega_py->descr->type_num != PyArray_DOUBLE)
225+
if (omega_py->descr->type_num != NPY_DOUBLE)
226226
{
227227
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
228228
return NULL;

‎src/weno_gauss_legendre005003.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ py_weights_gauss_legendre005003 (PyObject * self, PyObject * args)
127127
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
128128
return NULL;
129129

130-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
130+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
131131
{
132132
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
133133
return NULL;
134134
}
135135

136-
if (omega_py->descr->type_num != PyArray_DOUBLE)
136+
if (omega_py->descr->type_num != NPY_DOUBLE)
137137
{
138138
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
139139
return NULL;
@@ -295,13 +295,13 @@ py_reconstruct_gauss_legendre005003 (PyObject * self, PyObject * args)
295295
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
296296
return NULL;
297297

298-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
298+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
299299
{
300300
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
301301
return NULL;
302302
}
303303

304-
if (fr_py->descr->type_num != PyArray_DOUBLE)
304+
if (fr_py->descr->type_num != NPY_DOUBLE)
305305
{
306306
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
307307
return NULL;
@@ -313,7 +313,7 @@ py_reconstruct_gauss_legendre005003 (PyObject * self, PyObject * args)
313313
return NULL;
314314
}
315315

316-
if (omega_py->descr->type_num != PyArray_DOUBLE)
316+
if (omega_py->descr->type_num != NPY_DOUBLE)
317317
{
318318
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
319319
return NULL;

‎src/weno_gauss_legendre005004.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ py_weights_gauss_legendre005004 (PyObject * self, PyObject * args)
117117
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
118118
return NULL;
119119

120-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
120+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
121121
{
122122
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
123123
return NULL;
124124
}
125125

126-
if (omega_py->descr->type_num != PyArray_DOUBLE)
126+
if (omega_py->descr->type_num != NPY_DOUBLE)
127127
{
128128
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
129129
return NULL;
@@ -307,13 +307,13 @@ py_reconstruct_gauss_legendre005004 (PyObject * self, PyObject * args)
307307
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
308308
return NULL;
309309

310-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
310+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
311311
{
312312
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
313313
return NULL;
314314
}
315315

316-
if (fr_py->descr->type_num != PyArray_DOUBLE)
316+
if (fr_py->descr->type_num != NPY_DOUBLE)
317317
{
318318
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
319319
return NULL;
@@ -325,7 +325,7 @@ py_reconstruct_gauss_legendre005004 (PyObject * self, PyObject * args)
325325
return NULL;
326326
}
327327

328-
if (omega_py->descr->type_num != PyArray_DOUBLE)
328+
if (omega_py->descr->type_num != NPY_DOUBLE)
329329
{
330330
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
331331
return NULL;

‎src/weno_gauss_legendre005005.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ py_weights_gauss_legendre005005 (PyObject * self, PyObject * args)
170170
if (!PyArg_ParseTuple (args, "OO", &sigma_py, &omega_py))
171171
return NULL;
172172

173-
if (sigma_py->nd != 2 || sigma_py->descr->type_num != PyArray_DOUBLE)
173+
if (sigma_py->nd != 2 || sigma_py->descr->type_num != NPY_DOUBLE)
174174
{
175175
PyErr_SetString (PyExc_ValueError, "sigma must be two-dimensional and of type float");
176176
return NULL;
177177
}
178178

179-
if (omega_py->descr->type_num != PyArray_DOUBLE)
179+
if (omega_py->descr->type_num != NPY_DOUBLE)
180180
{
181181
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
182182
return NULL;
@@ -400,13 +400,13 @@ py_reconstruct_gauss_legendre005005 (PyObject * self, PyObject * args)
400400
if (!PyArg_ParseTuple (args, "OOO", &f_py, &omega_py, &fr_py))
401401
return NULL;
402402

403-
if (f_py->nd != 1 || f_py->descr->type_num != PyArray_DOUBLE)
403+
if (f_py->nd != 1 || f_py->descr->type_num != NPY_DOUBLE)
404404
{
405405
PyErr_SetString (PyExc_ValueError, "f must be one-dimensional and of type float");
406406
return NULL;
407407
}
408408

409-
if (fr_py->descr->type_num != PyArray_DOUBLE)
409+
if (fr_py->descr->type_num != NPY_DOUBLE)
410410
{
411411
PyErr_SetString (PyExc_ValueError, "fr must be of type float");
412412
return NULL;
@@ -418,7 +418,7 @@ py_reconstruct_gauss_legendre005005 (PyObject * self, PyObject * args)
418418
return NULL;
419419
}
420420

421-
if (omega_py->descr->type_num != PyArray_DOUBLE)
421+
if (omega_py->descr->type_num != NPY_DOUBLE)
422422
{
423423
PyErr_SetString (PyExc_ValueError, "omega must be of type float");
424424
return NULL;

0 commit comments

Comments
 (0)