diff --git a/at_time/coreneuron/example.cpp b/at_time/coreneuron/example.cpp index 389a1fc5..a39e8670 100644 --- a/at_time/coreneuron/example.cpp +++ b/at_time/coreneuron/example.cpp @@ -202,7 +202,7 @@ namespace coreneuron { } - inline double f_example(int id, int pnodecount, example_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double f_example(int id, int pnodecount, example_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); inline double f_example(int id, int pnodecount, example_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx) { diff --git a/at_time/neuron/example.cpp b/at_time/neuron/example.cpp index 1e75c178..691a396c 100644 --- a/at_time/neuron/example.cpp +++ b/at_time/neuron/example.cpp @@ -143,7 +143,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double f_example(_nrn_mechanism_cache_range& _lmc, example_Instance& inst, example_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double f_example(_nrn_mechanism_cache_range& _lmc, example_Instance& inst, example_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/builtin_functions/coreneuron/compile_only.cpp b/builtin_functions/coreneuron/compile_only.cpp index 40d45d91..3a6de10b 100644 --- a/builtin_functions/coreneuron/compile_only.cpp +++ b/builtin_functions/coreneuron/compile_only.cpp @@ -203,7 +203,7 @@ namespace coreneuron { } - inline double call_nrn_ghk_compile_only(int id, int pnodecount, compile_only_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double call_nrn_ghk_compile_only(int id, int pnodecount, compile_only_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double call_nrn_ghk_compile_only(int id, int pnodecount, compile_only_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/builtin_functions/neuron/compile_only.cpp b/builtin_functions/neuron/compile_only.cpp index 4e9a455e..ceeb8701 100644 --- a/builtin_functions/neuron/compile_only.cpp +++ b/builtin_functions/neuron/compile_only.cpp @@ -143,7 +143,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double call_nrn_ghk_compile_only(_nrn_mechanism_cache_range& _lmc, compile_only_Instance& inst, compile_only_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double call_nrn_ghk_compile_only(_nrn_mechanism_cache_range& _lmc, compile_only_Instance& inst, compile_only_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/constant/coreneuron/constant.cpp b/constant/coreneuron/constant.cpp index d55e2a26..0376f823 100644 --- a/constant/coreneuron/constant.cpp +++ b/constant/coreneuron/constant.cpp @@ -203,7 +203,7 @@ namespace coreneuron { } - inline double foo_constant_mod(int id, int pnodecount, constant_mod_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double foo_constant_mod(int id, int pnodecount, constant_mod_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double foo_constant_mod(int id, int pnodecount, constant_mod_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/constant/neuron/constant.cpp b/constant/neuron/constant.cpp index 9a985d3d..1e7bff86 100644 --- a/constant/neuron/constant.cpp +++ b/constant/neuron/constant.cpp @@ -148,7 +148,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double foo_constant_mod(_nrn_mechanism_cache_range& _lmc, constant_mod_Instance& inst, constant_mod_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double foo_constant_mod(_nrn_mechanism_cache_range& _lmc, constant_mod_Instance& inst, constant_mod_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/external/neuron/dst.cpp b/external/neuron/dst.cpp index 69abfa66..cc48b64c 100644 --- a/external/neuron/dst.cpp +++ b/external/neuron/dst.cpp @@ -146,8 +146,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double get_gbl_dst(_nrn_mechanism_cache_range& _lmc, dst_Instance& inst, dst_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double get_param_dst(_nrn_mechanism_cache_range& _lmc, dst_Instance& inst, dst_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double get_gbl_dst(_nrn_mechanism_cache_range& _lmc, dst_Instance& inst, dst_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double get_param_dst(_nrn_mechanism_cache_range& _lmc, dst_Instance& inst, dst_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/coreneuron/compile_only.cpp b/function/coreneuron/compile_only.cpp index e165a8c3..42614d20 100644 --- a/function/coreneuron/compile_only.cpp +++ b/function/coreneuron/compile_only.cpp @@ -209,9 +209,9 @@ namespace coreneuron { } - inline int func_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int func_with_v_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline int func_with_other_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lq); + inline static int func_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int func_with_v_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static int func_with_other_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lq); inline int func_func_in_breakpoint(int id, int pnodecount, func_in_breakpoint_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/function/coreneuron/functions.cpp b/function/coreneuron/functions.cpp index 3969982c..8f436ecf 100644 --- a/function/coreneuron/functions.cpp +++ b/function/coreneuron/functions.cpp @@ -205,9 +205,9 @@ namespace coreneuron { } - inline double x_plus_a_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline double v_plus_a_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline double identity_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double x_plus_a_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static double v_plus_a_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static double identity_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline double x_plus_a_functions(int id, int pnodecount, functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la) { diff --git a/function/coreneuron/localize_arguments.cpp b/function/coreneuron/localize_arguments.cpp index e1c218d8..4df8f0c9 100644 --- a/function/coreneuron/localize_arguments.cpp +++ b/function/coreneuron/localize_arguments.cpp @@ -226,13 +226,13 @@ namespace coreneuron { } - inline double id_v_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline double id_nai_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lnai); - inline double id_ina_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lina); - inline double id_x_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); - inline double id_g_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lg); - inline double id_s_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _ls); - inline double id_p_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lp); + inline static double id_v_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double id_nai_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lnai); + inline static double id_ina_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lina); + inline static double id_x_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double id_g_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lg); + inline static double id_s_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _ls); + inline static double id_p_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lp); inline double id_v_localize_arguments(int id, int pnodecount, localize_arguments_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv) { diff --git a/function/coreneuron/point_functions.cpp b/function/coreneuron/point_functions.cpp index f857d2e6..49bedb71 100644 --- a/function/coreneuron/point_functions.cpp +++ b/function/coreneuron/point_functions.cpp @@ -210,9 +210,9 @@ namespace coreneuron { } - inline double x_plus_a_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline double v_plus_a_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline double identity_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double x_plus_a_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static double v_plus_a_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static double identity_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline double x_plus_a_point_functions(int id, int pnodecount, point_functions_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la) { diff --git a/function/coreneuron/recursion.cpp b/function/coreneuron/recursion.cpp index 1ce86533..c8083a32 100644 --- a/function/coreneuron/recursion.cpp +++ b/function/coreneuron/recursion.cpp @@ -202,7 +202,7 @@ namespace coreneuron { } - inline double fibonacci_recursion(int id, int pnodecount, recursion_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _ln); + inline static double fibonacci_recursion(int id, int pnodecount, recursion_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _ln); inline double fibonacci_recursion(int id, int pnodecount, recursion_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _ln) { diff --git a/function/neuron/artificial_functions.cpp b/function/neuron/artificial_functions.cpp index 05d8ab14..dac97dfb 100644 --- a/function/neuron/artificial_functions.cpp +++ b/function/neuron/artificial_functions.cpp @@ -168,8 +168,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double x_plus_a_art_functions(_nrn_mechanism_cache_range& _lmc, art_functions_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double identity_art_functions(_nrn_mechanism_cache_range& _lmc, art_functions_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double x_plus_a_art_functions(_nrn_mechanism_cache_range& _lmc, art_functions_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double identity_art_functions(_nrn_mechanism_cache_range& _lmc, art_functions_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/compile_only.cpp b/function/neuron/compile_only.cpp index e9310a0f..95d4a7ff 100644 --- a/function/neuron/compile_only.cpp +++ b/function/neuron/compile_only.cpp @@ -153,9 +153,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline int func_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int func_with_v_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline int func_with_other_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lq); + inline static int func_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int func_with_v_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static int func_with_other_func_in_breakpoint(_nrn_mechanism_cache_range& _lmc, func_in_breakpoint_Instance& inst, func_in_breakpoint_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lq); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/functions.cpp b/function/neuron/functions.cpp index ab5f0d44..9071d9e7 100644 --- a/function/neuron/functions.cpp +++ b/function/neuron/functions.cpp @@ -146,9 +146,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double x_plus_a_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double v_plus_a_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double identity_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double x_plus_a_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double v_plus_a_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double identity_functions(_nrn_mechanism_cache_range& _lmc, functions_Instance& inst, functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/localize_arguments.cpp b/function/neuron/localize_arguments.cpp index 8dc99100..37f538c8 100644 --- a/function/neuron/localize_arguments.cpp +++ b/function/neuron/localize_arguments.cpp @@ -184,13 +184,13 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double id_v_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline double id_nai_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lnai); - inline double id_ina_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lina); - inline double id_x_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); - inline double id_g_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lg); - inline double id_s_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _ls); - inline double id_p_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lp); + inline static double id_v_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double id_nai_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lnai); + inline static double id_ina_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lina); + inline static double id_x_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double id_g_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lg); + inline static double id_s_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _ls); + inline static double id_p_localize_arguments(_nrn_mechanism_cache_range& _lmc, localize_arguments_Instance& inst, localize_arguments_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lp); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/non_threadsafe.cpp b/function/neuron/non_threadsafe.cpp index 0ca1283e..dc83ecd7 100644 --- a/function/neuron/non_threadsafe.cpp +++ b/function/neuron/non_threadsafe.cpp @@ -158,9 +158,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double x_plus_a_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double v_plus_a_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double identity_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double x_plus_a_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double v_plus_a_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double identity_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/point_functions.cpp b/function/neuron/point_functions.cpp index 2316aea6..35035792 100644 --- a/function/neuron/point_functions.cpp +++ b/function/neuron/point_functions.cpp @@ -156,9 +156,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double x_plus_a_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double v_plus_a_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double identity_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double x_plus_a_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double v_plus_a_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double identity_point_functions(_nrn_mechanism_cache_range& _lmc, point_functions_Instance& inst, point_functions_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/point_non_threadsafe.cpp b/function/neuron/point_non_threadsafe.cpp index 069de059..6b07a632 100644 --- a/function/neuron/point_non_threadsafe.cpp +++ b/function/neuron/point_non_threadsafe.cpp @@ -168,9 +168,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double x_plus_a_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double v_plus_a_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline double identity_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double x_plus_a_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double v_plus_a_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static double identity_point_non_threadsafe(_nrn_mechanism_cache_range& _lmc, point_non_threadsafe_Instance& inst, point_non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function/neuron/recursion.cpp b/function/neuron/recursion.cpp index fd410b97..ca50fa80 100644 --- a/function/neuron/recursion.cpp +++ b/function/neuron/recursion.cpp @@ -143,7 +143,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double fibonacci_recursion(_nrn_mechanism_cache_range& _lmc, recursion_Instance& inst, recursion_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _ln); + inline static double fibonacci_recursion(_nrn_mechanism_cache_range& _lmc, recursion_Instance& inst, recursion_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _ln); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/function_table/coreneuron/function_table.cpp b/function_table/coreneuron/function_table.cpp index 68a3dc75..db29bc32 100644 --- a/function_table/coreneuron/function_table.cpp +++ b/function_table/coreneuron/function_table.cpp @@ -206,7 +206,7 @@ namespace coreneuron { } - inline double use_tau2_function_table(int id, int pnodecount, function_table_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv, double _lx); + inline static double use_tau2_function_table(int id, int pnodecount, function_table_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv, double _lx); inline double use_tau2_function_table(int id, int pnodecount, function_table_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv, double _lx) { diff --git a/function_table/neuron/function_table.cpp b/function_table/neuron/function_table.cpp index 0dd7d9be..b9013fb1 100644 --- a/function_table/neuron/function_table.cpp +++ b/function_table/neuron/function_table.cpp @@ -160,7 +160,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double use_tau2_function_table(_nrn_mechanism_cache_range& _lmc, function_table_Instance& inst, function_table_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv, double _lx); + inline static double use_tau2_function_table(_nrn_mechanism_cache_range& _lmc, function_table_Instance& inst, function_table_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv, double _lx); double cnst1_function_table(double v); double table_cnst1_function_table(); double cnst2_function_table(double v, double x); diff --git a/global/neuron/non_threadsafe.cpp b/global/neuron/non_threadsafe.cpp index 32d11a6d..baf701d5 100644 --- a/global/neuron/non_threadsafe.cpp +++ b/global/neuron/non_threadsafe.cpp @@ -163,9 +163,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double get_gbl_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double get_top_local_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double get_parameter_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double get_gbl_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double get_top_local_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double get_parameter_non_threadsafe(_nrn_mechanism_cache_range& _lmc, non_threadsafe_Instance& inst, non_threadsafe_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/global/neuron/thread_variable.cpp b/global/neuron/thread_variable.cpp index bf74d70b..f7028c9e 100644 --- a/global/neuron/thread_variable.cpp +++ b/global/neuron/thread_variable.cpp @@ -209,9 +209,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double sum_arr_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt); - inline int set_g_w_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz); - inline int compute_g_v1_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz); + inline static double sum_arr_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt); + inline static int set_g_w_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz); + inline static int compute_g_v1_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } @@ -437,7 +437,7 @@ namespace neuron { } - inline int compute_g_v1_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz){ + inline static int compute_g_v1_shared_global(_nrn_mechanism_cache_range& _lmc, shared_global_Instance& inst, shared_global_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, shared_global_ThreadVariables& _thread_vars, NrnThread* nt, double _lzz){ if (inst.global->usetable == 0) { f_compute_g_v1_shared_global(_lmc, inst, node_data, id, _ppvar, _thread, _thread_vars, nt, _lzz); return 0; diff --git a/hodgkin_huxley/coreneuron/hodhux.cpp b/hodgkin_huxley/coreneuron/hodhux.cpp index 0c470dcc..ab87051f 100644 --- a/hodgkin_huxley/coreneuron/hodhux.cpp +++ b/hodgkin_huxley/coreneuron/hodhux.cpp @@ -278,9 +278,9 @@ namespace coreneuron { } - inline double vtrap_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx, double _ly); - inline int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int rates_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double vtrap_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx, double _ly); + inline static int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int rates_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/hodgkin_huxley/neuron/hodhux.cpp b/hodgkin_huxley/neuron/hodhux.cpp index 8f816de5..186c63f1 100644 --- a/hodgkin_huxley/neuron/hodhux.cpp +++ b/hodgkin_huxley/neuron/hodhux.cpp @@ -254,9 +254,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double vtrap_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx, double _ly); - inline int states_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int rates_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double vtrap_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx, double _ly); + inline static int states_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int rates_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/kinetic/coreneuron/X2Y.cpp b/kinetic/coreneuron/X2Y.cpp index 9ae8614d..7e4803d8 100644 --- a/kinetic/coreneuron/X2Y.cpp +++ b/kinetic/coreneuron/X2Y.cpp @@ -613,7 +613,7 @@ namespace coreneuron { } - inline int rates_X2Y(int id, int pnodecount, X2Y_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int rates_X2Y(int id, int pnodecount, X2Y_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); struct functor_X2Y_0 { diff --git a/kinetic/neuron/X2Y.cpp b/kinetic/neuron/X2Y.cpp index 9007e621..97b35b94 100644 --- a/kinetic/neuron/X2Y.cpp +++ b/kinetic/neuron/X2Y.cpp @@ -560,7 +560,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline int rates_X2Y(_nrn_mechanism_cache_range& _lmc, X2Y_Instance& inst, X2Y_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int rates_X2Y(_nrn_mechanism_cache_range& _lmc, X2Y_Instance& inst, X2Y_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/longitudinal_diffusion/neuron/heat_eqn_function.cpp b/longitudinal_diffusion/neuron/heat_eqn_function.cpp index 0ee64903..c99b72aa 100644 --- a/longitudinal_diffusion/neuron/heat_eqn_function.cpp +++ b/longitudinal_diffusion/neuron/heat_eqn_function.cpp @@ -574,9 +574,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double factor_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); - inline double vol_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); - inline double mu_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); + inline static double factor_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); + inline static double vol_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); + inline static double mu_heat_eqn_function(_nrn_mechanism_cache_range& _lmc, heat_eqn_function_Instance& inst, heat_eqn_function_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, heat_eqn_function_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); static void* _diffusion_space_X; static double _diffusion_coefficient_X(int _i, Memb_list* _ml_arg, size_t id, Datum* _ppvar, double* _pdvol, double* _pdfcdc, Datum* /* _thread */, NrnThread* nt, const _nrn_model_sorted_token& _sorted_token) { _nrn_mechanism_cache_range _lmc{_sorted_token, *nt, *_ml_arg, _ml_arg->type()}; diff --git a/morphology/coreneuron/two_radii.cpp b/morphology/coreneuron/two_radii.cpp index ca2278c8..0f04dfcf 100644 --- a/morphology/coreneuron/two_radii.cpp +++ b/morphology/coreneuron/two_radii.cpp @@ -214,8 +214,8 @@ namespace coreneuron { } - inline double square_diam_two_radii(int id, int pnodecount, two_radii_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline double square_area_two_radii(int id, int pnodecount, two_radii_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double square_diam_two_radii(int id, int pnodecount, two_radii_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double square_area_two_radii(int id, int pnodecount, two_radii_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double square_diam_two_radii(int id, int pnodecount, two_radii_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/morphology/neuron/two_radii.cpp b/morphology/neuron/two_radii.cpp index c15f609b..0471c00b 100644 --- a/morphology/neuron/two_radii.cpp +++ b/morphology/neuron/two_radii.cpp @@ -162,8 +162,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double square_diam_two_radii(_nrn_mechanism_cache_range& _lmc, two_radii_Instance& inst, two_radii_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double square_area_two_radii(_nrn_mechanism_cache_range& _lmc, two_radii_Instance& inst, two_radii_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double square_diam_two_radii(_nrn_mechanism_cache_range& _lmc, two_radii_Instance& inst, two_radii_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double square_area_two_radii(_nrn_mechanism_cache_range& _lmc, two_radii_Instance& inst, two_radii_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/net_receive/coreneuron/NetReceiveCalls.cpp b/net_receive/coreneuron/NetReceiveCalls.cpp index 16bd2e9a..99925b79 100644 --- a/net_receive/coreneuron/NetReceiveCalls.cpp +++ b/net_receive/coreneuron/NetReceiveCalls.cpp @@ -220,8 +220,8 @@ namespace coreneuron { } - inline double one_NetReceiveCalls(int id, int pnodecount, NetReceiveCalls_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int increment_c2_NetReceiveCalls(int id, int pnodecount, NetReceiveCalls_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double one_NetReceiveCalls(int id, int pnodecount, NetReceiveCalls_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int increment_c2_NetReceiveCalls(int id, int pnodecount, NetReceiveCalls_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline int increment_c2_NetReceiveCalls(int id, int pnodecount, NetReceiveCalls_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/net_receive/neuron/NetReceiveCalls.cpp b/net_receive/neuron/NetReceiveCalls.cpp index 85de1326..1a8ed651 100644 --- a/net_receive/neuron/NetReceiveCalls.cpp +++ b/net_receive/neuron/NetReceiveCalls.cpp @@ -161,8 +161,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double one_NetReceiveCalls(_nrn_mechanism_cache_range& _lmc, NetReceiveCalls_Instance& inst, NetReceiveCalls_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int increment_c2_NetReceiveCalls(_nrn_mechanism_cache_range& _lmc, NetReceiveCalls_Instance& inst, NetReceiveCalls_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double one_NetReceiveCalls(_nrn_mechanism_cache_range& _lmc, NetReceiveCalls_Instance& inst, NetReceiveCalls_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int increment_c2_NetReceiveCalls(_nrn_mechanism_cache_range& _lmc, NetReceiveCalls_Instance& inst, NetReceiveCalls_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/nonlinear/coreneuron/art_nonlin.cpp b/nonlinear/coreneuron/art_nonlin.cpp index 348cce2d..ae36139b 100644 --- a/nonlinear/coreneuron/art_nonlin.cpp +++ b/nonlinear/coreneuron/art_nonlin.cpp @@ -595,8 +595,8 @@ namespace coreneuron { } - inline double solve_art_nonlin(int id, int pnodecount, art_nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline double residual_art_nonlin(int id, int pnodecount, art_nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double solve_art_nonlin(int id, int pnodecount, art_nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double residual_art_nonlin(int id, int pnodecount, art_nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); struct functor_art_nonlin_0 { diff --git a/nonlinear/coreneuron/nonlin.cpp b/nonlinear/coreneuron/nonlin.cpp index 4d76facc..aec5b9e4 100644 --- a/nonlinear/coreneuron/nonlin.cpp +++ b/nonlinear/coreneuron/nonlin.cpp @@ -590,8 +590,8 @@ namespace coreneuron { } - inline double solve_nonlin(int id, int pnodecount, nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline double residual_nonlin(int id, int pnodecount, nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double solve_nonlin(int id, int pnodecount, nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double residual_nonlin(int id, int pnodecount, nonlin_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); struct functor_nonlin_0 { diff --git a/nonlinear/neuron/art_nonlin.cpp b/nonlinear/neuron/art_nonlin.cpp index 84f50e1d..a8629584 100644 --- a/nonlinear/neuron/art_nonlin.cpp +++ b/nonlinear/neuron/art_nonlin.cpp @@ -545,8 +545,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double solve_art_nonlin(_nrn_mechanism_cache_range& _lmc, art_nonlin_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double residual_art_nonlin(_nrn_mechanism_cache_range& _lmc, art_nonlin_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double solve_art_nonlin(_nrn_mechanism_cache_range& _lmc, art_nonlin_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double residual_art_nonlin(_nrn_mechanism_cache_range& _lmc, art_nonlin_Instance& inst, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/nonlinear/neuron/nonlin.cpp b/nonlinear/neuron/nonlin.cpp index 3a2fca89..88afdc55 100644 --- a/nonlinear/neuron/nonlin.cpp +++ b/nonlinear/neuron/nonlin.cpp @@ -535,8 +535,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double solve_nonlin(_nrn_mechanism_cache_range& _lmc, nonlin_Instance& inst, nonlin_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double residual_nonlin(_nrn_mechanism_cache_range& _lmc, nonlin_Instance& inst, nonlin_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double solve_nonlin(_nrn_mechanism_cache_range& _lmc, nonlin_Instance& inst, nonlin_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double residual_nonlin(_nrn_mechanism_cache_range& _lmc, nonlin_Instance& inst, nonlin_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/pointer/coreneuron/basic_pointer.cpp b/pointer/coreneuron/basic_pointer.cpp index 25935809..c231839a 100644 --- a/pointer/coreneuron/basic_pointer.cpp +++ b/pointer/coreneuron/basic_pointer.cpp @@ -222,8 +222,8 @@ namespace coreneuron { } - inline double read_p1_basic_pointer(int id, int pnodecount, basic_pointer_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline double read_p2_basic_pointer(int id, int pnodecount, basic_pointer_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double read_p1_basic_pointer(int id, int pnodecount, basic_pointer_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double read_p2_basic_pointer(int id, int pnodecount, basic_pointer_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double read_p1_basic_pointer(int id, int pnodecount, basic_pointer_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/pointer/coreneuron/point_basic.cpp b/pointer/coreneuron/point_basic.cpp index e4976156..5cbc2e01 100644 --- a/pointer/coreneuron/point_basic.cpp +++ b/pointer/coreneuron/point_basic.cpp @@ -227,8 +227,8 @@ namespace coreneuron { } - inline double read_p1_point_basic(int id, int pnodecount, point_basic_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline double read_p2_point_basic(int id, int pnodecount, point_basic_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double read_p1_point_basic(int id, int pnodecount, point_basic_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double read_p2_point_basic(int id, int pnodecount, point_basic_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double read_p1_point_basic(int id, int pnodecount, point_basic_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/pointer/coreneuron/pointing.cpp b/pointer/coreneuron/pointing.cpp index a209042b..e40d5136 100644 --- a/pointer/coreneuron/pointing.cpp +++ b/pointer/coreneuron/pointing.cpp @@ -205,7 +205,7 @@ namespace coreneuron { } - inline double is_valid_pointing(int id, int pnodecount, pointing_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double is_valid_pointing(int id, int pnodecount, pointing_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double is_valid_pointing(int id, int pnodecount, pointing_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/pointer/neuron/basic_pointer.cpp b/pointer/neuron/basic_pointer.cpp index 852e79aa..fd579769 100644 --- a/pointer/neuron/basic_pointer.cpp +++ b/pointer/neuron/basic_pointer.cpp @@ -170,8 +170,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double read_p1_basic_pointer(_nrn_mechanism_cache_range& _lmc, basic_pointer_Instance& inst, basic_pointer_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double read_p2_basic_pointer(_nrn_mechanism_cache_range& _lmc, basic_pointer_Instance& inst, basic_pointer_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double read_p1_basic_pointer(_nrn_mechanism_cache_range& _lmc, basic_pointer_Instance& inst, basic_pointer_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double read_p2_basic_pointer(_nrn_mechanism_cache_range& _lmc, basic_pointer_Instance& inst, basic_pointer_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/pointer/neuron/point_basic.cpp b/pointer/neuron/point_basic.cpp index 58efd522..0cb9ba87 100644 --- a/pointer/neuron/point_basic.cpp +++ b/pointer/neuron/point_basic.cpp @@ -177,8 +177,8 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double read_p1_point_basic(_nrn_mechanism_cache_range& _lmc, point_basic_Instance& inst, point_basic_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline double read_p2_point_basic(_nrn_mechanism_cache_range& _lmc, point_basic_Instance& inst, point_basic_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double read_p1_point_basic(_nrn_mechanism_cache_range& _lmc, point_basic_Instance& inst, point_basic_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double read_p2_point_basic(_nrn_mechanism_cache_range& _lmc, point_basic_Instance& inst, point_basic_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/pointer/neuron/pointing.cpp b/pointer/neuron/pointing.cpp index 384420bb..9f5101b8 100644 --- a/pointer/neuron/pointing.cpp +++ b/pointer/neuron/pointing.cpp @@ -149,7 +149,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double is_valid_pointing(_nrn_mechanism_cache_range& _lmc, pointing_Instance& inst, pointing_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double is_valid_pointing(_nrn_mechanism_cache_range& _lmc, pointing_Instance& inst, pointing_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/procedure/coreneuron/point_procedures.cpp b/procedure/coreneuron/point_procedures.cpp index 8660c1c1..44e12bd9 100644 --- a/procedure/coreneuron/point_procedures.cpp +++ b/procedure/coreneuron/point_procedures.cpp @@ -210,13 +210,13 @@ namespace coreneuron { } - inline double identity_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline int set_x_42_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_a_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline int set_a_x_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_v_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_just_v_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_just_vv_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double identity_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static int set_x_42_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_a_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static int set_a_x_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_v_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_just_v_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_just_vv_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline int set_x_42_point_procedures(int id, int pnodecount, point_procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/procedure/coreneuron/procedures.cpp b/procedure/coreneuron/procedures.cpp index 5ede77a0..2c175a93 100644 --- a/procedure/coreneuron/procedures.cpp +++ b/procedure/coreneuron/procedures.cpp @@ -205,13 +205,13 @@ namespace coreneuron { } - inline double identity_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline int set_x_42_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_a_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); - inline int set_a_x_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_v_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_just_v_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int set_x_just_vv_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double identity_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static int set_x_42_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_a_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _la); + inline static int set_a_x_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_v_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_just_v_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int set_x_just_vv_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline int set_x_42_procedures(int id, int pnodecount, procedures_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/procedure/neuron/point_procedures.cpp b/procedure/neuron/point_procedures.cpp index 8a84ee18..a03206ff 100644 --- a/procedure/neuron/point_procedures.cpp +++ b/procedure/neuron/point_procedures.cpp @@ -156,13 +156,13 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double identity_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline int set_x_42_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_a_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline int set_a_x_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_v_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_just_v_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_just_vv_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double identity_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static int set_x_42_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_a_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static int set_a_x_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_v_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_just_v_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_just_vv_point_procedures(_nrn_mechanism_cache_range& _lmc, point_procedures_Instance& inst, point_procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/procedure/neuron/procedures.cpp b/procedure/neuron/procedures.cpp index 0dcef8ba..54a37cb7 100644 --- a/procedure/neuron/procedures.cpp +++ b/procedure/neuron/procedures.cpp @@ -146,13 +146,13 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double identity_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline int set_x_42_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_a_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); - inline int set_a_x_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_v_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_just_v_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int set_x_just_vv_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double identity_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static int set_x_42_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_a_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _la); + inline static int set_a_x_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_v_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_just_v_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int set_x_just_vv_procedures(_nrn_mechanism_cache_range& _lmc, procedures_Instance& inst, procedures_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/random/coreneuron/random_variable.cpp b/random/coreneuron/random_variable.cpp index b4d95439..8a8555ee 100644 --- a/random/coreneuron/random_variable.cpp +++ b/random/coreneuron/random_variable.cpp @@ -210,7 +210,7 @@ namespace coreneuron { } - inline double negexp_random_variable(int id, int pnodecount, random_variable_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static double negexp_random_variable(int id, int pnodecount, random_variable_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); inline double negexp_random_variable(int id, int pnodecount, random_variable_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/random/neuron/random_variable.cpp b/random/neuron/random_variable.cpp index 90078312..b1bee789 100644 --- a/random/neuron/random_variable.cpp +++ b/random/neuron/random_variable.cpp @@ -149,7 +149,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double negexp_random_variable(_nrn_mechanism_cache_range& _lmc, random_variable_Instance& inst, random_variable_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static double negexp_random_variable(_nrn_mechanism_cache_range& _lmc, random_variable_Instance& inst, random_variable_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/solve/neuron/finite_difference.cpp b/solve/neuron/finite_difference.cpp index a6de09b5..4a7ed013 100644 --- a/solve/neuron/finite_difference.cpp +++ b/solve/neuron/finite_difference.cpp @@ -565,7 +565,7 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double f_finite_difference(_nrn_mechanism_cache_range& _lmc, finite_difference_Instance& inst, finite_difference_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, finite_difference_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); + inline static double f_finite_difference(_nrn_mechanism_cache_range& _lmc, finite_difference_Instance& inst, finite_difference_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, finite_difference_ThreadVariables& _thread_vars, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/spike_travel/coreneuron/hodhux.cpp b/spike_travel/coreneuron/hodhux.cpp index 0c470dcc..ab87051f 100644 --- a/spike_travel/coreneuron/hodhux.cpp +++ b/spike_travel/coreneuron/hodhux.cpp @@ -278,9 +278,9 @@ namespace coreneuron { } - inline double vtrap_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx, double _ly); - inline int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); - inline int rates_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static double vtrap_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx, double _ly); + inline static int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v); + inline static int rates_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); inline int states_hodhux(int id, int pnodecount, hodhux_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v) { diff --git a/spike_travel/neuron/hodhux.cpp b/spike_travel/neuron/hodhux.cpp index 8f816de5..186c63f1 100644 --- a/spike_travel/neuron/hodhux.cpp +++ b/spike_travel/neuron/hodhux.cpp @@ -254,9 +254,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double vtrap_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx, double _ly); - inline int states_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); - inline int rates_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static double vtrap_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx, double _ly); + inline static int states_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt); + inline static int rates_hodhux(_nrn_mechanism_cache_range& _lmc, hodhux_Instance& inst, hodhux_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } diff --git a/table/coreneuron/table.cpp b/table/coreneuron/table.cpp index cbf9ec14..c2e3c08a 100644 --- a/table/coreneuron/table.cpp +++ b/table/coreneuron/table.cpp @@ -238,9 +238,9 @@ namespace coreneuron { } - inline double quadratic_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); - inline int sigmoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline int sinusoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double quadratic_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static int sigmoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static int sinusoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); inline int f_sigmoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv) { @@ -280,7 +280,7 @@ namespace coreneuron { } - inline int sigmoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv){ + inline static int sigmoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv){ if (inst->global->usetable == 0) { f_sigmoidal_tbl(id, pnodecount, inst, data, indexes, thread, nt, v, _lv); return 0; @@ -341,7 +341,7 @@ namespace coreneuron { } - inline int sinusoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ + inline static int sinusoidal_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ if (inst->global->usetable == 0) { f_sinusoidal_tbl(id, pnodecount, inst, data, indexes, thread, nt, v, _lx); return 0; @@ -402,7 +402,7 @@ namespace coreneuron { } - inline double quadratic_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ + inline static double quadratic_tbl(int id, int pnodecount, tbl_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ if (inst->global->usetable == 0) { return f_quadratic_tbl(id, pnodecount, inst, data, indexes, thread, nt, v, _lx); } diff --git a/table/coreneuron/table_point_process.cpp b/table/coreneuron/table_point_process.cpp index 4048a7ee..365725fd 100644 --- a/table/coreneuron/table_point_process.cpp +++ b/table/coreneuron/table_point_process.cpp @@ -243,9 +243,9 @@ namespace coreneuron { } - inline double quadratic_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); - inline int sigmoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); - inline int sinusoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static double quadratic_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); + inline static int sigmoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv); + inline static int sinusoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx); inline int f_sigmoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv) { @@ -285,7 +285,7 @@ namespace coreneuron { } - inline int sigmoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv){ + inline static int sigmoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lv){ if (inst->global->usetable == 0) { f_sigmoidal_tbl_point_process(id, pnodecount, inst, data, indexes, thread, nt, v, _lv); return 0; @@ -346,7 +346,7 @@ namespace coreneuron { } - inline int sinusoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ + inline static int sinusoidal_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ if (inst->global->usetable == 0) { f_sinusoidal_tbl_point_process(id, pnodecount, inst, data, indexes, thread, nt, v, _lx); return 0; @@ -407,7 +407,7 @@ namespace coreneuron { } - inline double quadratic_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ + inline static double quadratic_tbl_point_process(int id, int pnodecount, tbl_point_process_Instance* inst, double* data, const Datum* indexes, ThreadDatum* thread, NrnThread* nt, double v, double _lx){ if (inst->global->usetable == 0) { return f_quadratic_tbl_point_process(id, pnodecount, inst, data, indexes, thread, nt, v, _lx); } diff --git a/table/neuron/table.cpp b/table/neuron/table.cpp index 1f531b02..3da8074a 100644 --- a/table/neuron/table.cpp +++ b/table/neuron/table.cpp @@ -221,9 +221,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double quadratic_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); - inline int sigmoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline int sinusoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double quadratic_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static int sigmoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static int sinusoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } @@ -438,7 +438,7 @@ namespace neuron { } - inline int sigmoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv){ + inline static int sigmoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv){ if (inst.global->usetable == 0) { f_sigmoidal_tbl(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lv); return 0; @@ -500,7 +500,7 @@ namespace neuron { } - inline int sinusoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ + inline static int sinusoidal_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ if (inst.global->usetable == 0) { f_sinusoidal_tbl(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lx); return 0; @@ -562,7 +562,7 @@ namespace neuron { } - inline double quadratic_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ + inline static double quadratic_tbl(_nrn_mechanism_cache_range& _lmc, tbl_Instance& inst, tbl_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ if (inst.global->usetable == 0) { return f_quadratic_tbl(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lx); } diff --git a/table/neuron/table_point_process.cpp b/table/neuron/table_point_process.cpp index 29e681f1..1af617a8 100644 --- a/table/neuron/table_point_process.cpp +++ b/table/neuron/table_point_process.cpp @@ -231,9 +231,9 @@ namespace neuron { /* Mechanism procedures and functions */ - inline double quadratic_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); - inline int sigmoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); - inline int sinusoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static double quadratic_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); + inline static int sigmoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv); + inline static int sinusoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx); static void _apply_diffusion_function(ldifusfunc2_t _f, const _nrn_model_sorted_token& _sorted_token, NrnThread& _nt) { } @@ -417,7 +417,7 @@ namespace neuron { } - inline int sigmoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv){ + inline static int sigmoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lv){ if (inst.global->usetable == 0) { f_sigmoidal_tbl_point_process(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lv); return 0; @@ -479,7 +479,7 @@ namespace neuron { } - inline int sinusoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ + inline static int sinusoidal_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ if (inst.global->usetable == 0) { f_sinusoidal_tbl_point_process(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lx); return 0; @@ -541,7 +541,7 @@ namespace neuron { } - inline double quadratic_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ + inline static double quadratic_tbl_point_process(_nrn_mechanism_cache_range& _lmc, tbl_point_process_Instance& inst, tbl_point_process_NodeData& node_data, size_t id, Datum* _ppvar, Datum* _thread, NrnThread* nt, double _lx){ if (inst.global->usetable == 0) { return f_quadratic_tbl_point_process(_lmc, inst, node_data, id, _ppvar, _thread, nt, _lx); }