Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove magic number support for Func1 in clib #1741

Merged
merged 14 commits into from
Jul 31, 2024
Merged

Remove magic number support for Func1 in clib #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
661bd5a
[clib] Fix func_write
ischoegl Jul 28, 2024
49489df
[MATLAB] Use new Func1 interfaces
ischoegl Jul 28, 2024
e9855d0
[MATLAB] Overload operators for Func1
ischoegl Jul 28, 2024
657cf97
[clib] Remove magic number support for Func1
ischoegl Jul 27, 2024
ff6a889
[Func1] Rename Poly1 to Poly 13 and add write
ischoegl Jul 28, 2024
b84a86b
[Func1] Remove deprecated derivative3
ischoegl Jul 27, 2024
433bcf3
[clib] Replace func_write
ischoegl Jul 28, 2024
50d34ff
[clib] Reintroduce domain_type
ischoegl Jul 28, 2024
fe8c5d9
[Func1] Implement checkFunc1 to check functor type
ischoegl Jul 28, 2024
8dd70ff
[MATLAB] Improve Func1 handling
ischoegl Jul 28, 2024
f024f53
[Python] Refine Func1.cxx_functor API
ischoegl Jul 28, 2024
93b4960
[MATLAB] Rename Func to Func1
ischoegl Jul 28, 2024
c9807ba
[Func1] Remove raw pointers
ischoegl Jul 30, 2024
4e761a7
[Func1] Improve nomenclature
ischoegl Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions include/cantera/clib/ctfunc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,7 @@
extern "C" {
#endif

const int FourierFuncType = 1;
const int PolyFuncType = 2;
const int ArrheniusFuncType = 3;
const int GaussianFuncType = 4;
const int SumFuncType = 20;
const int DiffFuncType = 25;
const int ProdFuncType = 30;
const int RatioFuncType = 40;
const int PeriodicFuncType = 50;
const int CompositeFuncType = 60;
const int TimesConstantFuncType = 70;
const int PlusConstantFuncType = 80;
const int SinFuncType = 100;
const int CosFuncType = 102;
const int ExpFuncType = 104;
const int PowFuncType = 106;
const int ConstFuncType = 110;
const int TabulatedFuncType = 120;

CANTERA_CAPI int func_new(int type, size_t n, size_t lenp, const double* p);
CANTERA_CAPI int func_check(const char* type, size_t len, char* buf); //!< @since New in %Cantera 3.1
CANTERA_CAPI int func_new_basic(const char* type, double c);
CANTERA_CAPI int func_new_advanced(const char* type, size_t lenp, const double* p);
CANTERA_CAPI int func_new_compound(const char* type, int a, int b);
Expand All @@ -43,7 +24,7 @@ extern "C" {
CANTERA_CAPI double func_value(int i, double t);
CANTERA_CAPI int func_derivative(int i);
CANTERA_CAPI int func_duplicate(int i);
CANTERA_CAPI int func_write(int i, size_t lennm, const char* arg, char* nm);
CANTERA_CAPI int func_write(int i, const char* arg, size_t lennm, char* nm); //!< @since Changed signature in %Cantera 3.1
CANTERA_CAPI int ct_clearFunc();

#ifdef __cplusplus
Expand Down
3 changes: 1 addition & 2 deletions include/cantera/clib/ctonedim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ extern "C" {
CANTERA_CAPI int ct_clearOneDim();
CANTERA_CAPI int domain_new(const char* type, int i, const char* id);
CANTERA_CAPI int domain_del(int i);
// @todo: reintroduce domain_type as synonym for domain_type3
CANTERA_CAPI int domain_type3(int i, size_t lennm, char* nm);
CANTERA_CAPI int domain_type(int i, size_t lennm, char* nm);
CANTERA_CAPI size_t domain_index(int i);
CANTERA_CAPI size_t domain_nComponents(int i);
CANTERA_CAPI size_t domain_nPoints(int i);
Expand Down
Loading
Loading