Added changes in eion.cpp and global_vars.cpp

Author: iomaganaris

coreneuron/io/global_vars.cpp

@@ -11,6 +11,7 @@
 #include <map>
 #include <string>
 #include <algorithm>
+#include <unordered_map>
 
 #include "coreneuron/utils/randoms/nrnran123.h"
 #include "coreneuron/nrnconf.h"
@@ -28,6 +29,8 @@ using N2V = std::map<std::string, PSD>;
 
 static N2V* n2v;
 
+extern std::unordered_map<std::string, double> nrn_ion_init;
+
 void hoc_register_var(DoubScal* ds, DoubVec* dv, VoidFunc*) {
     if (!n2v) {
         n2v = new N2V();
@@ -62,7 +65,6 @@ void set_globals(const char* path, bool cli_global_seed, int cli_global_seed_val
             // will be processed before exit from loop.
             if (val) {
                 N2V::iterator it = n2v->find(name);
-                printf("Passing from NEURON %s %d %g\n", name, size, *val);
                 if (it != n2v->end()) {
                     if (size == 0) {
                         nrn_assert(it->second.first == 0);
@@ -114,6 +116,8 @@ void set_globals(const char* path, bool cli_global_seed, int cli_global_seed_val
                 if (it != n2v->end()) {
                     nrn_assert(it->second.first == 0);
                     *(it->second.second) = val;
+                } else if (static_cast<std::string>(name).find("ion") != std::string::npos) {
+                    nrn_ion_init[name] = val;
                 }
             } else if (sscanf(line, "%[^[][%d]\n", name, &n) == 2) {
                 if (strcmp(name, "0") == 0) {

coreneuron/mechanism/eion.cpp

@@ -60,6 +60,15 @@ double nrn_ion_charge(int type) {
     return global_charge(type);
 }
 
+std::unordered_map<std::string, double> nrn_ion_init = {
+    {"nai0_na_ion", DEF_nai},
+    {"nao0_na_ion", DEF_nao},
+    {"ki0_k_ion", DEF_ki},
+    {"ko0_k_ion", DEF_ko},
+    {"cai0_ca_ion", DEF_cai},
+    {"cao0_ca_ion", DEF_cao},
+};
+
 void ion_reg(const char* name, double valence) {
     char buf[7][50];
 #define VAL_SENTINAL -10000.
@@ -109,25 +118,30 @@ void ion_reg(const char* name, double valence) {
         sprintf(buf[1], "%so0_%s", name, buf[0]);
         if (strcmp("na", name) == 0) {
             na_ion = mechtype;
-            printf("Setting global_conci(na) to %lf and global_conco(na) to %lf\n", DEF_nai, DEF_nao);
-            global_conci(mechtype) = DEF_nai;
-            global_conco(mechtype) = DEF_nao;
+            global_conci(mechtype) = nrn_ion_init["nai0_na_ion"];
+            global_conco(mechtype) = nrn_ion_init["nao0_na_ion"];
             global_charge(mechtype) = 1.;
         } else if (strcmp("k", name) == 0) {
             k_ion = mechtype;
-            printf("Setting global_conci(k) to %lf and global_conco(k) to %lf\n",DEF_ki, DEF_ko);
-            global_conci(mechtype) = DEF_ki;
-            global_conco(mechtype) = DEF_ko;
+            global_conci(mechtype) = nrn_ion_init["ki0_k_ion"];
+            global_conco(mechtype) = nrn_ion_init["ko0_k_ion"];
             global_charge(mechtype) = 1.;
         } else if (strcmp("ca", name) == 0) {
             ca_ion = mechtype;
-            printf("Setting global_conci(ca) to %lf and global_conco(ca) to %lf\n", DEF_cai, DEF_cao);
-            global_conci(mechtype) = DEF_cai;
-            global_conco(mechtype) = DEF_cao;
+            global_conci(mechtype) = nrn_ion_init["cai0_ca_ion"];
+            global_conco(mechtype) = nrn_ion_init["cao0_ca_ion"];
             global_charge(mechtype) = 2.;
         } else {
-            global_conci(mechtype) = DEF_ioni;
-            global_conco(mechtype) = DEF_iono;
+            if (nrn_ion_init[static_cast<std::string>(buf[0])]) {
+                global_conci(mechtype) = nrn_ion_init[static_cast<std::string>(buf[0])];
+            } else {
+                global_conci(mechtype) = DEF_ioni;
+            }
+            if (nrn_ion_init[static_cast<std::string>(buf[1])]) {
+                global_conco(mechtype) = nrn_ion_init[static_cast<std::string>(buf[1])];
+            } else {
+                global_conco(mechtype) = DEF_iono;
+            }
             global_charge(mechtype) = VAL_SENTINAL;
         }
     }