Add missing variables in INITIAL block (#14)

JCGoran · web-flow · commit ed7a7401f27b · 2024-05-06T12:00:15.000+02:00
When calling functions or procedures in the INITIAL block, we need to define
additional variables in `nrn_init` so the compilation succeeds.
diff --git a/cnexp_scalar/neuron/leonhard.cpp b/cnexp_scalar/neuron/leonhard.cpp
@@ -178,7 +178,10 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
             inst.x[id] = 42.0;
         }
     }
@@ -189,6 +192,8 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
             inst.x[id] = inst.x[id] + (1.0 - exp(_nt->_dt * ( -1.0))) * ( -(0.0) / ( -1.0) - inst.x[id]);
         }
diff --git a/func_proc/coreneuron/func_proc.cpp b/func_proc/coreneuron/func_proc.cpp
@@ -262,6 +262,7 @@ namespace coreneuron {
                 #if NRN_PRCELLSTATE
                 inst->v_unused[id] = v;
                 #endif
+                set_a_x_test_func_proc(id, pnodecount, inst, data, indexes, thread, nt, v);
             }
         }
     }
diff --git a/func_proc/neuron/func_proc.cpp b/func_proc/neuron/func_proc.cpp
@@ -363,7 +363,11 @@ namespace neuron {
         auto inst = make_instance_test_func_proc(_lmr);
         auto node_data = make_node_data_test_func_proc(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
+            set_a_x_test_func_proc(_ml, inst, id, _ppvar, _thread, _nt);
         }
     }
 
diff --git a/func_proc_pnt/neuron/func_proc_pnt.cpp b/func_proc_pnt/neuron/func_proc_pnt.cpp
@@ -289,7 +289,10 @@ namespace neuron {
         auto inst = make_instance_test_func_proc_pnt(_lmr);
         auto node_data = make_node_data_test_func_proc_pnt(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
         }
     }
 
diff --git a/global_breakpoint/neuron/leonhard.cpp b/global_breakpoint/neuron/leonhard.cpp
@@ -179,7 +179,10 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
             inst.x[id] = 42.0;
         }
     }
@@ -190,6 +193,8 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
             inst.x[id] = inst.global->c;
         }
diff --git a/nonspecific_current/neuron/leonhard.cpp b/nonspecific_current/neuron/leonhard.cpp
@@ -174,7 +174,10 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
         }
     }
 
@@ -193,6 +196,8 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
             int node_id = node_data.nodeindices[id];
             double v = node_data.node_voltages[node_id];
@@ -212,6 +217,8 @@ namespace neuron {
         auto inst = make_instance_leonhard(_lmr);
         auto node_data = make_node_data_leonhard(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
         }
     }
diff --git a/parameter/neuron/neuron_variables.cpp b/parameter/neuron/neuron_variables.cpp
@@ -177,7 +177,10 @@ namespace neuron {
         auto inst = make_instance_NeuronVariables(_lmr);
         auto node_data = make_node_data_NeuronVariables(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
         }
     }
 
@@ -187,6 +190,8 @@ namespace neuron {
         auto inst = make_instance_NeuronVariables(_lmr);
         auto node_data = make_node_data_NeuronVariables(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
             inst.range_celsius[id] = *(inst.celsius);
         }
diff --git a/parameter/neuron/test_parameter.cpp b/parameter/neuron/test_parameter.cpp
@@ -198,7 +198,10 @@ namespace neuron {
         auto inst = make_instance_test_parameter(_lmr);
         auto node_data = make_node_data_test_parameter(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
         }
     }
 
diff --git a/point_process/neuron/test_pp.cpp b/point_process/neuron/test_pp.cpp
@@ -194,7 +194,10 @@ namespace neuron {
         auto inst = make_instance_test_pp(_lmr);
         auto node_data = make_node_data_test_pp(*_nt, *_ml_arg);
         auto nodecount = _ml_arg->nodecount;
+        auto* const _ml = &_lmr;
+        auto* _thread = _ml_arg->_thread;
         for (int id = 0; id < nodecount; id++) {
+            auto& _ppvar = _ml_arg->pdata[id];
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,10 @@ namespace neuron {`
`178`	`178`	`auto inst = make_instance_leonhard(_lmr);`
`179`	`179`	`auto node_data = make_node_data_leonhard(_nt, _ml_arg);`
`180`	`180`	`auto nodecount = _ml_arg->nodecount;`
	`181`	`+ auto* const _ml = &_lmr;`
	`182`	`+ auto* _thread = _ml_arg->_thread;`
`181`	`183`	`for (int id = 0; id < nodecount; id++) {`
	`184`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`182`	`185`	`inst.x[id] = 42.0;`
`183`	`186`	`}`
`184`	`187`	`}`
`@@ -189,6 +192,8 @@ namespace neuron {`
`189`	`192`	`auto inst = make_instance_leonhard(_lmr);`
`190`	`193`	`auto node_data = make_node_data_leonhard(_nt, _ml_arg);`
`191`	`194`	`auto nodecount = _ml_arg->nodecount;`
	`195`	`+ auto* const _ml = &_lmr;`
	`196`	`+ auto* _thread = _ml_arg->_thread;`
`192`	`197`	`for (int id = 0; id < nodecount; id++) {`
`193`	`198`	`inst.x[id] = inst.x[id] + (1.0 - exp(_nt->_dt * ( -1.0))) * ( -(0.0) / ( -1.0) - inst.x[id]);`
`194`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ namespace coreneuron {`
`262`	`262`	`#if NRN_PRCELLSTATE`
`263`	`263`	`inst->v_unused[id] = v;`
`264`	`264`	`#endif`
	`265`	`+ set_a_x_test_func_proc(id, pnodecount, inst, data, indexes, thread, nt, v);`
`265`	`266`	`}`
`266`	`267`	`}`
`267`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,11 @@ namespace neuron {`
`363`	`363`	`auto inst = make_instance_test_func_proc(_lmr);`
`364`	`364`	`auto node_data = make_node_data_test_func_proc(_nt, _ml_arg);`
`365`	`365`	`auto nodecount = _ml_arg->nodecount;`
	`366`	`+ auto* const _ml = &_lmr;`
	`367`	`+ auto* _thread = _ml_arg->_thread;`
`366`	`368`	`for (int id = 0; id < nodecount; id++) {`
	`369`	`+ auto& _ppvar = _ml_arg->pdata[id];`
	`370`	`+ set_a_x_test_func_proc(_ml, inst, id, _ppvar, _thread, _nt);`
`367`	`371`	`}`
`368`	`372`	`}`
`369`	`373`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,10 @@ namespace neuron {`
`289`	`289`	`auto inst = make_instance_test_func_proc_pnt(_lmr);`
`290`	`290`	`auto node_data = make_node_data_test_func_proc_pnt(_nt, _ml_arg);`
`291`	`291`	`auto nodecount = _ml_arg->nodecount;`
	`292`	`+ auto* const _ml = &_lmr;`
	`293`	`+ auto* _thread = _ml_arg->_thread;`
`292`	`294`	`for (int id = 0; id < nodecount; id++) {`
	`295`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`293`	`296`	`}`
`294`	`297`	`}`
`295`	`298`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,10 @@ namespace neuron {`
`179`	`179`	`auto inst = make_instance_leonhard(_lmr);`
`180`	`180`	`auto node_data = make_node_data_leonhard(_nt, _ml_arg);`
`181`	`181`	`auto nodecount = _ml_arg->nodecount;`
	`182`	`+ auto* const _ml = &_lmr;`
	`183`	`+ auto* _thread = _ml_arg->_thread;`
`182`	`184`	`for (int id = 0; id < nodecount; id++) {`
	`185`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`183`	`186`	`inst.x[id] = 42.0;`
`184`	`187`	`}`
`185`	`188`	`}`
`@@ -190,6 +193,8 @@ namespace neuron {`
`190`	`193`	`auto inst = make_instance_leonhard(_lmr);`
`191`	`194`	`auto node_data = make_node_data_leonhard(_nt, _ml_arg);`
`192`	`195`	`auto nodecount = _ml_arg->nodecount;`
	`196`	`+ auto* const _ml = &_lmr;`
	`197`	`+ auto* _thread = _ml_arg->_thread;`
`193`	`198`	`for (int id = 0; id < nodecount; id++) {`
`194`	`199`	`inst.x[id] = inst.global->c;`
`195`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,10 @@ namespace neuron {`
`177`	`177`	`auto inst = make_instance_NeuronVariables(_lmr);`
`178`	`178`	`auto node_data = make_node_data_NeuronVariables(_nt, _ml_arg);`
`179`	`179`	`auto nodecount = _ml_arg->nodecount;`
	`180`	`+ auto* const _ml = &_lmr;`
	`181`	`+ auto* _thread = _ml_arg->_thread;`
`180`	`182`	`for (int id = 0; id < nodecount; id++) {`
	`183`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`181`	`184`	`}`
`182`	`185`	`}`
`183`	`186`
`@@ -187,6 +190,8 @@ namespace neuron {`
`187`	`190`	`auto inst = make_instance_NeuronVariables(_lmr);`
`188`	`191`	`auto node_data = make_node_data_NeuronVariables(_nt, _ml_arg);`
`189`	`192`	`auto nodecount = _ml_arg->nodecount;`
	`193`	`+ auto* const _ml = &_lmr;`
	`194`	`+ auto* _thread = _ml_arg->_thread;`
`190`	`195`	`for (int id = 0; id < nodecount; id++) {`
`191`	`196`	`inst.range_celsius[id] = *(inst.celsius);`
`192`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,10 @@ namespace neuron {`
`198`	`198`	`auto inst = make_instance_test_parameter(_lmr);`
`199`	`199`	`auto node_data = make_node_data_test_parameter(_nt, _ml_arg);`
`200`	`200`	`auto nodecount = _ml_arg->nodecount;`
	`201`	`+ auto* const _ml = &_lmr;`
	`202`	`+ auto* _thread = _ml_arg->_thread;`
`201`	`203`	`for (int id = 0; id < nodecount; id++) {`
	`204`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`202`	`205`	`}`
`203`	`206`	`}`
`204`	`207`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,10 @@ namespace neuron {`
`194`	`194`	`auto inst = make_instance_test_pp(_lmr);`
`195`	`195`	`auto node_data = make_node_data_test_pp(_nt, _ml_arg);`
`196`	`196`	`auto nodecount = _ml_arg->nodecount;`
	`197`	`+ auto* const _ml = &_lmr;`
	`198`	`+ auto* _thread = _ml_arg->_thread;`
`197`	`199`	`for (int id = 0; id < nodecount; id++) {`
	`200`	`+ auto& _ppvar = _ml_arg->pdata[id];`
`198`	`201`	`}`
`199`	`202`	`}`
`200`	`203`