Skip to content

Commit 6cb2452

Browse files
balos1balos1
committed
format
1 parent ae62f23 commit 6cb2452

File tree

50 files changed

+3178
-2594
lines changed

Some content is hidden

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

50 files changed

+3178
-2594
lines changed

‎bindings/pysundials/arkode/pysundials_arkode.cpp‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -161,45 +161,49 @@ void bind_arkode(nb::module_& m)
161161
arkode_lsjacrhsfn_wrapper, nb::arg("arkode_mem"),
162162
nb::arg("jtimesRhsFn").none());
163163

164-
m.def("ARKodeSetMassTimes",
165-
[](void* ark_mem,
166-
std::function<std::remove_pointer_t<ARKLsMassTimesSetupFn>> msetup,
167-
std::function<std::remove_pointer_t<ARKLsMassTimesVecFn>> mtimes)
168-
{
169-
void* user_data = nullptr;
170-
ARKodeGetUserData(ark_mem, &user_data);
171-
if (!user_data)
172-
throw std::runtime_error(
173-
"Failed to get Python function table from ARKODE memory");
174-
auto fntable = static_cast<arkode_user_supplied_fn_table*>(user_data);
175-
fntable->lsmasstimessetupfn = nb::cast(msetup);
176-
fntable->lsmasstimesvecfn = nb::cast(mtimes);
177-
return ARKodeSetMassTimes(ark_mem, &arkode_lsmasstimessetupfn_wrapper,
178-
&arkode_lsmasstimesvecfn_wrapper, nullptr);
179-
}, nb::arg("arkode_mem"), nb::arg("msetup").none(), nb::arg("mtimes").none());
164+
m.def(
165+
"ARKodeSetMassTimes",
166+
[](void* ark_mem,
167+
std::function<std::remove_pointer_t<ARKLsMassTimesSetupFn>> msetup,
168+
std::function<std::remove_pointer_t<ARKLsMassTimesVecFn>> mtimes)
169+
{
170+
void* user_data = nullptr;
171+
ARKodeGetUserData(ark_mem, &user_data);
172+
if (!user_data)
173+
throw std::runtime_error(
174+
"Failed to get Python function table from ARKODE memory");
175+
auto fntable = static_cast<arkode_user_supplied_fn_table*>(user_data);
176+
fntable->lsmasstimessetupfn = nb::cast(msetup);
177+
fntable->lsmasstimesvecfn = nb::cast(mtimes);
178+
return ARKodeSetMassTimes(ark_mem, &arkode_lsmasstimessetupfn_wrapper,
179+
&arkode_lsmasstimesvecfn_wrapper, nullptr);
180+
},
181+
nb::arg("arkode_mem"), nb::arg("msetup").none(), nb::arg("mtimes").none());
180182

181183
BIND_ARKODE_CALLBACK(ARKodeSetLinSysFn, ARKLsLinSysFn, lslinsysfn,
182184
arkode_lslinsysfn_wrapper, nb::arg("arkode_mem"),
183185
nb::arg("linsys").none());
184186

185187
// ARKodeSetMassTimes doesnt fit the BIND_ARKODE_CALLBACK macro pattern(s)
186188
// due to the 4th argument for user data, so we just write it out explicitly.
187-
m.def("ARKodeSetMassTimes",
188-
[](void* ark_mem,
189-
std::function<std::remove_pointer_t<ARKLsMassTimesSetupFn>> msetup,
190-
std::function<std::remove_pointer_t<ARKLsMassTimesVecFn>> mtimes)
191-
{
192-
void* user_data = nullptr;
193-
ARKodeGetUserData(ark_mem, &user_data);
194-
if (!user_data)
195-
throw std::runtime_error(
196-
"Failed to get Python function table from ARKODE memory");
197-
auto fntable = static_cast<arkode_user_supplied_fn_table*>(user_data);
198-
fntable->lsmasstimessetupfn = nb::cast(msetup);
199-
fntable->lsmasstimesvecfn = nb::cast(mtimes);
200-
return ARKodeSetMassTimes(ark_mem, &arkode_lsmasstimessetupfn_wrapper,
201-
&arkode_lsmasstimesvecfn_wrapper, nullptr);
202-
}, nb::arg("ark_mem"), nb::arg("msetup").none(), nb::arg("mtimes").none());
189+
m.def(
190+
"ARKodeSetMassTimes",
191+
[](void* ark_mem,
192+
std::function<std::remove_pointer_t<ARKLsMassTimesSetupFn>> msetup,
193+
std::function<std::remove_pointer_t<ARKLsMassTimesVecFn>> mtimes)
194+
{
195+
void* user_data = nullptr;
196+
ARKodeGetUserData(ark_mem, &user_data);
197+
if (!user_data)
198+
throw std::runtime_error(
199+
"Failed to get Python function table from ARKODE memory");
200+
auto fntable = static_cast<arkode_user_supplied_fn_table*>(user_data);
201+
fntable->lsmasstimessetupfn = nb::cast(msetup);
202+
fntable->lsmasstimesvecfn = nb::cast(mtimes);
203+
return ARKodeSetMassTimes(ark_mem, &arkode_lsmasstimessetupfn_wrapper,
204+
&arkode_lsmasstimesvecfn_wrapper, nullptr);
205+
},
206+
nb::arg("ark_mem"), nb::arg("msetup").none(), nb::arg("mtimes").none());
203207

204208
/////////////////////////////////////////////////////////////////////////////
205209
// Additional functions that litgen cannot generate

‎bindings/pysundials/arkode/pysundials_arkode_arkstep_generated.hpp‎

Lines changed: 56 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,69 @@
11
// #ifndef _ARKSTEP_H
2-
//
3-
// #ifdef __cplusplus
2+
//
3+
// #ifdef __cplusplus
44
// #endif
5-
//
5+
//
66

7-
m.def("ARKStepSetExplicit",
8-
ARKStepSetExplicit, nb::arg("arkode_mem"));
7+
m.def("ARKStepSetExplicit", ARKStepSetExplicit, nb::arg("arkode_mem"));
98

10-
m.def("ARKStepSetImplicit",
11-
ARKStepSetImplicit, nb::arg("arkode_mem"));
9+
m.def("ARKStepSetImplicit", ARKStepSetImplicit, nb::arg("arkode_mem"));
1210

13-
m.def("ARKStepSetImEx",
14-
ARKStepSetImEx, nb::arg("arkode_mem"));
11+
m.def("ARKStepSetImEx", ARKStepSetImEx, nb::arg("arkode_mem"));
1512

16-
m.def("ARKStepSetTables",
17-
ARKStepSetTables, nb::arg("arkode_mem"), nb::arg("q"), nb::arg("p"), nb::arg("Bi"), nb::arg("Be"));
13+
m.def("ARKStepSetTables", ARKStepSetTables, nb::arg("arkode_mem"), nb::arg("q"),
14+
nb::arg("p"), nb::arg("Bi"), nb::arg("Be"));
1815

19-
m.def("ARKStepSetTableNum",
20-
ARKStepSetTableNum, nb::arg("arkode_mem"), nb::arg("itable"), nb::arg("etable"));
16+
m.def("ARKStepSetTableNum", ARKStepSetTableNum, nb::arg("arkode_mem"),
17+
nb::arg("itable"), nb::arg("etable"));
2118

22-
m.def("ARKStepSetTableName",
23-
ARKStepSetTableName, nb::arg("arkode_mem"), nb::arg("itable"), nb::arg("etable"));
19+
m.def("ARKStepSetTableName", ARKStepSetTableName, nb::arg("arkode_mem"),
20+
nb::arg("itable"), nb::arg("etable"));
2421

25-
m.def("ARKStepGetTimestepperStats",
26-
[](void * arkode_mem, long expsteps, long accsteps, long step_attempts, long nfe_evals, long nfi_evals, long nlinsetups, long netfails) -> std::tuple<int, long, long, long, long, long, long, long>
22+
m.def(
23+
"ARKStepGetTimestepperStats",
24+
[](void* arkode_mem, long expsteps, long accsteps, long step_attempts,
25+
long nfe_evals, long nfi_evals, long nlinsetups,
26+
long netfails) -> std::tuple<int, long, long, long, long, long, long, long>
27+
{
28+
auto ARKStepGetTimestepperStats_adapt_modifiable_immutable_to_return =
29+
[](void* arkode_mem, long expsteps, long accsteps, long step_attempts,
30+
long nfe_evals, long nfi_evals, long nlinsetups,
31+
long netfails) -> std::tuple<int, long, long, long, long, long, long, long>
2732
{
28-
auto ARKStepGetTimestepperStats_adapt_modifiable_immutable_to_return = [](void * arkode_mem, long expsteps, long accsteps, long step_attempts, long nfe_evals, long nfi_evals, long nlinsetups, long netfails) -> std::tuple<int, long, long, long, long, long, long, long>
29-
{
30-
long * expsteps_adapt_modifiable = & expsteps;
31-
long * accsteps_adapt_modifiable = & accsteps;
32-
long * step_attempts_adapt_modifiable = & step_attempts;
33-
long * nfe_evals_adapt_modifiable = & nfe_evals;
34-
long * nfi_evals_adapt_modifiable = & nfi_evals;
35-
long * nlinsetups_adapt_modifiable = & nlinsetups;
36-
long * netfails_adapt_modifiable = & netfails;
37-
38-
int r = ARKStepGetTimestepperStats(arkode_mem, expsteps_adapt_modifiable, accsteps_adapt_modifiable, step_attempts_adapt_modifiable, nfe_evals_adapt_modifiable, nfi_evals_adapt_modifiable, nlinsetups_adapt_modifiable, netfails_adapt_modifiable);
39-
return std::make_tuple(r, expsteps, accsteps, step_attempts, nfe_evals, nfi_evals, nlinsetups, netfails);
40-
};
41-
42-
return ARKStepGetTimestepperStats_adapt_modifiable_immutable_to_return(arkode_mem, expsteps, accsteps, step_attempts, nfe_evals, nfi_evals, nlinsetups, netfails);
43-
}, nb::arg("arkode_mem"), nb::arg("expsteps"), nb::arg("accsteps"), nb::arg("step_attempts"), nb::arg("nfe_evals"), nb::arg("nfi_evals"), nb::arg("nlinsetups"), nb::arg("netfails"));
33+
long* expsteps_adapt_modifiable = &expsteps;
34+
long* accsteps_adapt_modifiable = &accsteps;
35+
long* step_attempts_adapt_modifiable = &step_attempts;
36+
long* nfe_evals_adapt_modifiable = &nfe_evals;
37+
long* nfi_evals_adapt_modifiable = &nfi_evals;
38+
long* nlinsetups_adapt_modifiable = &nlinsetups;
39+
long* netfails_adapt_modifiable = &netfails;
40+
41+
int r = ARKStepGetTimestepperStats(arkode_mem, expsteps_adapt_modifiable,
42+
accsteps_adapt_modifiable,
43+
step_attempts_adapt_modifiable,
44+
nfe_evals_adapt_modifiable,
45+
nfi_evals_adapt_modifiable,
46+
nlinsetups_adapt_modifiable,
47+
netfails_adapt_modifiable);
48+
return std::make_tuple(r, expsteps, accsteps, step_attempts, nfe_evals,
49+
nfi_evals, nlinsetups, netfails);
50+
};
51+
52+
return ARKStepGetTimestepperStats_adapt_modifiable_immutable_to_return(arkode_mem,
53+
expsteps,
54+
accsteps,
55+
step_attempts,
56+
nfe_evals,
57+
nfi_evals,
58+
nlinsetups,
59+
netfails);
60+
},
61+
nb::arg("arkode_mem"), nb::arg("expsteps"), nb::arg("accsteps"),
62+
nb::arg("step_attempts"), nb::arg("nfe_evals"), nb::arg("nfi_evals"),
63+
nb::arg("nlinsetups"), nb::arg("netfails"));
4464
// #ifdef __cplusplus
45-
//
65+
//
4666
// #endif
47-
//
67+
//
4868
// #endif
49-
//
69+
//

‎bindings/pysundials/arkode/pysundials_arkode_erkstep.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ void bind_arkode_erkstep(nb::module_& m)
2828
#include "pysundials_arkode_erkstep_generated.hpp"
2929

3030
m.def("ERKStepCreate",
31-
[](std::function<std::remove_pointer_t<ARKRhsFn>> rhs, sunrealtype t0, N_Vector y0,
32-
SUNContext sunctx)
31+
[](std::function<std::remove_pointer_t<ARKRhsFn>> rhs, sunrealtype t0,
32+
N_Vector y0, SUNContext sunctx)
3333
{
3434
void* ark_mem = ERKStepCreate(erkstep_f_wrapper, t0, y0, sunctx);
3535
if (ark_mem == nullptr)
@@ -39,7 +39,7 @@ void bind_arkode_erkstep(nb::module_& m)
3939

4040
// Create the user-supplied function table to store the Python user functions
4141
auto cb_fns = arkode_user_supplied_fn_table_alloc();
42-
42+
4343
// Smuggle the user-supplied function table into callback wrappers through the user_data pointer
4444
int ark_status = ARKodeSetUserData(ark_mem, static_cast<void*>(cb_fns));
4545
if (ark_status != ARK_SUCCESS)

‎bindings/pysundials/arkode/pysundials_arkode_erkstep_generated.hpp‎

Lines changed: 42 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,54 @@
11
// #ifndef _ERKSTEP_H
2-
//
3-
// #ifdef __cplusplus
2+
//
3+
// #ifdef __cplusplus
44
// #endif
5-
//
5+
//
66

7-
m.def("ERKStepSetTable",
8-
ERKStepSetTable, nb::arg("arkode_mem"), nb::arg("B"));
7+
m.def("ERKStepSetTable", ERKStepSetTable, nb::arg("arkode_mem"), nb::arg("B"));
98

10-
m.def("ERKStepSetTableNum",
11-
ERKStepSetTableNum, nb::arg("arkode_mem"), nb::arg("etable"));
9+
m.def("ERKStepSetTableNum", ERKStepSetTableNum, nb::arg("arkode_mem"),
10+
nb::arg("etable"));
1211

13-
m.def("ERKStepSetTableName",
14-
ERKStepSetTableName, nb::arg("arkode_mem"), nb::arg("etable"));
12+
m.def("ERKStepSetTableName", ERKStepSetTableName, nb::arg("arkode_mem"),
13+
nb::arg("etable"));
1514

16-
m.def("ERKStepGetTimestepperStats",
17-
[](void * arkode_mem, long expsteps, long accsteps, long step_attempts, long nfevals, long netfails) -> std::tuple<int, long, long, long, long, long>
15+
m.def(
16+
"ERKStepGetTimestepperStats",
17+
[](void* arkode_mem, long expsteps, long accsteps, long step_attempts,
18+
long nfevals, long netfails) -> std::tuple<int, long, long, long, long, long>
19+
{
20+
auto ERKStepGetTimestepperStats_adapt_modifiable_immutable_to_return =
21+
[](void* arkode_mem, long expsteps, long accsteps, long step_attempts,
22+
long nfevals,
23+
long netfails) -> std::tuple<int, long, long, long, long, long>
1824
{
19-
auto ERKStepGetTimestepperStats_adapt_modifiable_immutable_to_return = [](void * arkode_mem, long expsteps, long accsteps, long step_attempts, long nfevals, long netfails) -> std::tuple<int, long, long, long, long, long>
20-
{
21-
long * expsteps_adapt_modifiable = & expsteps;
22-
long * accsteps_adapt_modifiable = & accsteps;
23-
long * step_attempts_adapt_modifiable = & step_attempts;
24-
long * nfevals_adapt_modifiable = & nfevals;
25-
long * netfails_adapt_modifiable = & netfails;
25+
long* expsteps_adapt_modifiable = &expsteps;
26+
long* accsteps_adapt_modifiable = &accsteps;
27+
long* step_attempts_adapt_modifiable = &step_attempts;
28+
long* nfevals_adapt_modifiable = &nfevals;
29+
long* netfails_adapt_modifiable = &netfails;
2630

27-
int r = ERKStepGetTimestepperStats(arkode_mem, expsteps_adapt_modifiable, accsteps_adapt_modifiable, step_attempts_adapt_modifiable, nfevals_adapt_modifiable, netfails_adapt_modifiable);
28-
return std::make_tuple(r, expsteps, accsteps, step_attempts, nfevals, netfails);
29-
};
31+
int r = ERKStepGetTimestepperStats(arkode_mem, expsteps_adapt_modifiable,
32+
accsteps_adapt_modifiable,
33+
step_attempts_adapt_modifiable,
34+
nfevals_adapt_modifiable,
35+
netfails_adapt_modifiable);
36+
return std::make_tuple(r, expsteps, accsteps, step_attempts, nfevals,
37+
netfails);
38+
};
3039

31-
return ERKStepGetTimestepperStats_adapt_modifiable_immutable_to_return(arkode_mem, expsteps, accsteps, step_attempts, nfevals, netfails);
32-
}, nb::arg("arkode_mem"), nb::arg("expsteps"), nb::arg("accsteps"), nb::arg("step_attempts"), nb::arg("nfevals"), nb::arg("netfails"));
40+
return ERKStepGetTimestepperStats_adapt_modifiable_immutable_to_return(arkode_mem,
41+
expsteps,
42+
accsteps,
43+
step_attempts,
44+
nfevals,
45+
netfails);
46+
},
47+
nb::arg("arkode_mem"), nb::arg("expsteps"), nb::arg("accsteps"),
48+
nb::arg("step_attempts"), nb::arg("nfevals"), nb::arg("netfails"));
3349
// #ifdef __cplusplus
34-
//
50+
//
3551
// #endif
36-
//
52+
//
3753
// #endif
38-
//
54+
//

‎bindings/pysundials/arkode/pysundials_arkode_forcingstep_generated.hpp‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
// #ifndef ARKODE_FORCINGINGSTEP_H_
2-
//
3-
// #ifdef __cplusplus
2+
//
3+
// #ifdef __cplusplus
44
// #endif
5-
//
5+
//
66

7-
m.def("ForcingStepCreate",
8-
ForcingStepCreate, nb::arg("stepper1"), nb::arg("stepper2"), nb::arg("t0"), nb::arg("y0"), nb::arg("sunctx"));
7+
m.def("ForcingStepCreate", ForcingStepCreate, nb::arg("stepper1"),
8+
nb::arg("stepper2"), nb::arg("t0"), nb::arg("y0"), nb::arg("sunctx"));
99

10-
m.def("ForcingStepReInit",
11-
ForcingStepReInit, nb::arg("arkode_mem"), nb::arg("stepper1"), nb::arg("stepper2"), nb::arg("t0"), nb::arg("y0"));
10+
m.def("ForcingStepReInit", ForcingStepReInit, nb::arg("arkode_mem"),
11+
nb::arg("stepper1"), nb::arg("stepper2"), nb::arg("t0"), nb::arg("y0"));
1212

13-
m.def("ForcingStepGetNumEvolves",
14-
[](void * arkode_mem, int partition, long evolves) -> std::tuple<int, long>
13+
m.def(
14+
"ForcingStepGetNumEvolves",
15+
[](void* arkode_mem, int partition, long evolves) -> std::tuple<int, long>
16+
{
17+
auto ForcingStepGetNumEvolves_adapt_modifiable_immutable_to_return =
18+
[](void* arkode_mem, int partition, long evolves) -> std::tuple<int, long>
1519
{
16-
auto ForcingStepGetNumEvolves_adapt_modifiable_immutable_to_return = [](void * arkode_mem, int partition, long evolves) -> std::tuple<int, long>
17-
{
18-
long * evolves_adapt_modifiable = & evolves;
20+
long* evolves_adapt_modifiable = &evolves;
1921

20-
int r = ForcingStepGetNumEvolves(arkode_mem, partition, evolves_adapt_modifiable);
21-
return std::make_tuple(r, evolves);
22-
};
22+
int r = ForcingStepGetNumEvolves(arkode_mem, partition,
23+
evolves_adapt_modifiable);
24+
return std::make_tuple(r, evolves);
25+
};
2326

24-
return ForcingStepGetNumEvolves_adapt_modifiable_immutable_to_return(arkode_mem, partition, evolves);
25-
}, nb::arg("arkode_mem"), nb::arg("partition"), nb::arg("evolves"));
27+
return ForcingStepGetNumEvolves_adapt_modifiable_immutable_to_return(arkode_mem,
28+
partition,
29+
evolves);
30+
},
31+
nb::arg("arkode_mem"), nb::arg("partition"), nb::arg("evolves"));
2632
// #ifdef __cplusplus
27-
//
33+
//
2834
// #endif
29-
//
35+
//
3036
// #endif
31-
//
37+
//

0 commit comments

Comments
 (0)