Fix compilation error

neuronsimulator · Oct 28, 2024 · 29c4682 · 29c4682
1 parent f2a1c37
commit 29c4682
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/src/nocmodl/noccout.cpp b/src/nocmodl/noccout.cpp
@@ -260,9 +260,8 @@ void c_out() {
             P("  }\n");
             P("#if EXTRACELLULAR\n");
             P(" if (auto* const _extnode = _nrn_mechanism_access_extnode(_nd); _extnode) {\n");
-            P("   int index = _nd->eqn_index_;\n");
-            P("   OcSparseMatrix& m = *_nt->_sp13mat;\n");
-            P("   *m.mep(index, index) += _g;\n");
+            P("   int ind = _nrn_mechanism_access_index(_nd);\n");
+            P("   *_nrn_mechanism_get_matrix_elem(_nt, ind, ind) += _g;\n");
             P(" }\n");
             P("#endif\n");
         } else {
@@ -681,9 +680,8 @@ void c_out_vectorize() {
             P("  }\n");
             P("#if EXTRACELLULAR\n");
             P(" if (auto* const _extnode = _nrn_mechanism_access_extnode(_nd); _extnode) {\n");
-            P("   int index = _nd->eqn_index_;\n");
-            P("   OcSparseMatrix& m = *_nt->_sp13mat;\n");
-            P("   *m.mep(index, index) += _g;\n");
+            P("   int ind = _nrn_mechanism_access_index(_nd);\n");
+            P("   *_nrn_mechanism_get_matrix_elem(_nt, ind, ind) += _g;\n");
             P(" }\n");
             P("#endif\n");
         } else {

diff --git a/src/nrnoc/extcelln.cpp b/src/nrnoc/extcelln.cpp
@@ -7,6 +7,7 @@
 #include "nrniv_mf.h"
 #include "hocassrt.h"
 #include "parse.hpp"
+#include "ocmatrix.h"
 
 
 extern int nrn_use_daspk_;
@@ -430,7 +431,7 @@ void nrn_setup_ext(NrnThread* _nt) {
         OcSparseMatrix& m = *_nt->_sp13mat;
         Node* nd = ndlist[i];
         int index = nd->eqn_index_;
-        ExtNode* nde = nd->extnode;
+        Extnode* nde = nd->extnode;
         double d = NODED(nd);
         /* nde->_d only has -ELECTRODE_CURRENT contribution */
         *m.mep(index, index) += NODED(nd);
@@ -448,7 +449,7 @@ void nrn_setup_ext(NrnThread* _nt) {
         OcSparseMatrix& m = *_nt->_sp13mat;
         Node* nd = ndlist[i];
         int index = nd->eqn_index_;
-        ExtNode* nde = nd->extnode;
+        Extnode* nde = nd->extnode;
         Node* pnd = _nt->_v_parent[nd->v_node_index];
         if (pnd) {
             /* series resistance and capacitance to ground */
@@ -464,7 +465,7 @@ void nrn_setup_ext(NrnThread* _nt) {
                 *m.mep(index - 1 + j, index + j) -= mfac;
                 *m.mep(index + j, index - 1 + j) -= mfac;
             }
-            ExtNode* pnde = pnd->extnode;
+            Extnode* pnde = pnd->extnode;
             /* axial connections */
             if (pnde) { /* parent sec may not be extracellular */
                 OcSparseMatrix& m = *_nt->_sp13mat;

diff --git a/src/nrnoc/membfunc.cpp b/src/nrnoc/membfunc.cpp
@@ -2,6 +2,7 @@
 
 #include "multicore.h"
 #include "section.h"
+#include "ocmatrix.h"
 
 #include <cassert>
 
@@ -49,6 +50,13 @@ double& _nrn_mechanism_access_rhs(Node* node) {
 double& _nrn_mechanism_access_voltage(Node* node) {
     return node->v();
 }
+int _nrn_mechanism_access_index(const Node* node) {
+    return node->eqn_index_;
+}
+double* _nrn_mechanism_get_matrix_elem(NrnThread* nt, int i, int j) {
+    OcSparseMatrix& m = *nt->_sp13mat;
+    return m.mep(i, j);
+}
 neuron::container::data_handle<double> _nrn_mechanism_get_area_handle(Node* node) {
     if (node) {
         return node->area_handle();

diff --git a/src/nrnoc/membfunc.h b/src/nrnoc/membfunc.h
@@ -306,6 +306,8 @@ namespace _get {
 [[nodiscard]] double& _nrn_mechanism_access_param(Prop*, int field, int array_index = 0);
 [[nodiscard]] double& _nrn_mechanism_access_rhs(Node*);
 [[nodiscard]] double& _nrn_mechanism_access_voltage(Node*);
+[[nodiscard]] int _nrn_mechanism_access_index(const Node*);
+[[nodiscard]] double* _nrn_mechanism_get_matrix_elem(NrnThread* nt, int, int );
 [[nodiscard]] neuron::container::data_handle<double> _nrn_mechanism_get_area_handle(Node*);
 [[nodiscard]] Section* _nrn_mechanism_get_child(Section*);
 [[nodiscard]] int _nrn_mechanism_get_nnode(Section*);

diff --git a/src/nrnoc/multicore.cpp b/src/nrnoc/multicore.cpp
@@ -38,6 +38,7 @@ the handling of v_structure_change as long as possible.
 */
 
 #include "nmodlmutex.h"
+#include "ocmatrix.h"
 
 #include <cstdint>
 #include <condition_variable>