Skip to content
Snippets Groups Projects
Unverified Commit 3d1712b6 authored by Nora Abi Akar's avatar Nora Abi Akar Committed by GitHub
Browse files

Remove all mentions of initial_ion_data (#1397)

* Remove redundant `initial_ion_data` specification.
parent 8740e5a3
No related branches found
No related tags found
No related merge requests found
...@@ -134,9 +134,6 @@ void decor::set_default(defaultable what) { ...@@ -134,9 +134,6 @@ void decor::set_default(defaultable what) {
else if constexpr (std::is_same_v<membrane_capacitance, T>) { else if constexpr (std::is_same_v<membrane_capacitance, T>) {
defaults_.membrane_capacitance = p.value; defaults_.membrane_capacitance = p.value;
} }
else if constexpr (std::is_same_v<initial_ion_data, T>) {
defaults_.ion_data[p.ion] = p.initial;
}
else if constexpr (std::is_same_v<init_int_concentration, T>) { else if constexpr (std::is_same_v<init_int_concentration, T>) {
defaults_.ion_data[p.ion].init_int_concentration = p.value; defaults_.ion_data[p.ion].init_int_concentration = p.value;
} }
......
...@@ -160,11 +160,6 @@ private: ...@@ -160,11 +160,6 @@ private:
std::unordered_map<std::string, double> param_; std::unordered_map<std::string, double> param_;
}; };
struct initial_ion_data {
std::string ion;
cable_cell_ion_data initial;
};
struct ion_reversal_potential_method { struct ion_reversal_potential_method {
std::string ion; std::string ion;
mechanism_desc method; mechanism_desc method;
...@@ -191,7 +186,6 @@ using defaultable = ...@@ -191,7 +186,6 @@ using defaultable =
axial_resistivity, axial_resistivity,
temperature_K, temperature_K,
membrane_capacitance, membrane_capacitance,
initial_ion_data,
init_int_concentration, init_int_concentration,
init_ext_concentration, init_ext_concentration,
init_reversal_potential, init_reversal_potential,
......
...@@ -315,32 +315,6 @@ void register_cells(pybind11::module& m) { ...@@ -315,32 +315,6 @@ void register_cells(pybind11::module& m) {
.def("__str__", [](const arb::threshold_detector& d){ .def("__str__", [](const arb::threshold_detector& d){
return util::pprintf("(threshold_detector {})", d.threshold);}); return util::pprintf("(threshold_detector {})", d.threshold);});
// arb::cable_cell_ion_data
pybind11::class_<arb::initial_ion_data> ion_data(m, "ion",
"For setting ion properties (internal and external concentration and reversal potential) on cells and regions.");
ion_data
.def(pybind11::init(
[](const char* name,
optional<double> int_con,
optional<double> ext_con,
optional<double> rev_pot)
{
arb::initial_ion_data x;
x.ion = name;
if (int_con) x.initial.init_int_concentration = *int_con;
if (ext_con) x.initial.init_ext_concentration = *ext_con;
if (rev_pot) x.initial.init_reversal_potential = *rev_pot;
return x;
}
),
"ion_name"_a,
pybind11::arg_v("int_con", pybind11::none(), "Intial internal concentration [mM]"),
pybind11::arg_v("ext_con", pybind11::none(), "Intial external concentration [mM]"),
pybind11::arg_v("rev_pot", pybind11::none(), "Intial reversal potential [mV]"),
"If concentrations or reversal potential are specified as 'None',"
" cell default or global default value will be used, in that order if set.");
// arb::cable_cell_global_properties // arb::cable_cell_global_properties
pybind11::class_<arb::cable_cell_global_properties> gprop(m, "cable_global_properties"); pybind11::class_<arb::cable_cell_global_properties> gprop(m, "cable_global_properties");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment