Merge branch 'master' into olupton/python-overhaul

neuronsimulator · Apr 20, 2023 · 464b5e1 · 464b5e1
2 parents c414dc6 + a5a15c2
commit 464b5e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/external/mod2c b/external/mod2c
diff --git a/external/nmodl b/external/nmodl
diff --git a/src/modlunit/units.cpp b/src/modlunit/units.cpp
@@ -1194,7 +1194,7 @@ void nrnunit_dynamic_str(char (&buf)[NRN_BUFSIZE], const char* name, char* u1, c
 #if (defined(LegacyFR) && LegacyFR == 1)
     Sprintf(buf, "static double %s = %g;\n", name, unit_mag());
 #else
-    Sprintf(buf, "static double %s = %.12g;\n", name, unit_mag());
+    Sprintf(buf, "static double %s = %a;\n", name, unit_mag());
 #endif
     unit_pop();
 

diff --git a/test/pynrn/test_units.py b/test/pynrn/test_units.py
@@ -41,6 +41,7 @@ def test_mod_legacy():
     assert ut.e * ut.avogadro == ut.faraday
     assert abs(ut.faraday - h.FARADAY) < 1e-10
     assert ut.gasconst == h.R
+    assert ut.gasconst_exact == 8.313424
     assert ut.k * ut.avogadro == ut.gasconst
     assert abs(ut.planck - ut.hbar * 2.0 * h.PI) < 1e-49
     assert ut.avogadro == h.Avogadro_constant

diff --git a/test/pynrn/unitstest.mod b/test/pynrn/unitstest.mod
@@ -1,6 +1,6 @@
 NEURON {
   POINT_PROCESS UnitsTest
-  RANGE mole, e, faraday, planck, hbar, gasconst, avogadro, k
+  RANGE mole, e, faraday, planck, hbar, gasconst, gasconst_exact, avogadro, k
   RANGE erev, ghk
   USEION na READ ena WRITE ina
 }
@@ -15,6 +15,7 @@ UNITS {
   h = (planck) (joule-sec)
   hb = (hbar) (joule-sec)
   R = (k-mole) (joule/degC)
+  Rexact = 8.313424 (joule/degC)
   boltzmann = (k) (joule/degC)
 
   (avogadro) = (mole)
@@ -28,6 +29,7 @@ ASSIGNED {
   planck (joule-sec)
   hbar (joule-sec)
   gasconst (joule/degC)
+  gasconst_exact (joule/degC)
   avogadro (1)
   k (joule/degC)
   erev (mV)
@@ -43,6 +45,7 @@ INITIAL {
   planck = h
   hbar = hb
   gasconst = R
+  gasconst_exact = Rexact
   avogadro = avo
   k = boltzmann
   erev = ena
+1 −1		src/mod2c_core/nocpout.c
+1 −2		src/mod2c_core/units.c
+2 −2		test/validation/mod2c_core/cpp/isi.cpp
+1 −0		.sanitizers/undefined.supp
+5 −5		azure-pipelines.yml
+8 −11		src/codegen/codegen_cpp_visitor.cpp
+6 −0		src/codegen/codegen_cpp_visitor.hpp
+1 −1		src/lexer/unit.ll
+7 −5		src/main.cpp
+9 −5		src/parser/diffeq.yy
+3 −3		src/parser/diffeq_context.cpp
+2 −2		src/parser/diffeq_context.hpp
+1 −0		src/parser/main_units.cpp
+22 −20		src/parser/nmodl_driver.cpp
+4 −2		src/parser/nmodl_driver.hpp
+18 −32		src/parser/unit.yy
+0 −29		src/parser/unit_driver.cpp
+0 −9		src/parser/unit_driver.hpp
+45 −110		src/units/units.cpp
+1 −7		src/units/units.hpp
+0 −77		src/utils/common_utils.cpp
+0 −48		src/utils/common_utils.hpp
+15 −16		src/utils/file_library.cpp
+4 −4		src/utils/file_library.hpp
+5 −3		src/visitors/main.cpp
+25 −7		src/visitors/neuron_solve_visitor.cpp
+2 −0		src/visitors/neuron_solve_visitor.hpp
+7 −4		src/visitors/rename_visitor.cpp
+2 −21		src/visitors/units_visitor.cpp
+1 −0		test/unit/CMakeLists.txt
+68 −0		test/unit/codegen/codegen_cpp_visitor.cpp
+4 −5		test/unit/parser/parser.cpp
+1 −2		test/unit/units/lexer.cpp
+39 −19		test/unit/units/parser.cpp
+9 −9		test/unit/utils/nmodl_constructs.cpp
+21 −0		test/unit/utils/test_utils.cpp
+14 −0		test/unit/utils/test_utils.hpp
+59 −1		test/unit/visitor/inline.cpp
+1 −1		test/unit/visitor/nmodl.cpp
+140 −89		test/unit/visitor/units.cpp