Skip to content

Commit 8594f7d

Browse files
pgleesonpgleeson
authored
Merge pull request #16 from OpenSourceBrain/development
Is -> Isoma, Id -> Idend
2 parents eab6ffb + c4842e7 commit 8594f7d

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ x86_64
1515

1616
.DS_Store
1717
Thumbs.db
18+
arm64
19+
*_eden.py

‎NeuroML2/LEMS_Dimensionless/LEMS_Figure2DL.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212

1313
<Include file="pinskyRinzelCA3CellDL.xml"/>
1414

15-
<pinskyRinzelCA3CellDL id="pr2A" Is="0.75" Id="0" gc="2.1" qd0="0"
15+
<pinskyRinzelCA3CellDL id="pr2A" Isoma="0.75" Idend="0" gc="2.1" qd0="0"
1616
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
1717
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
1818
pp="0.5" Cm="3" alphac="2" betac="0.1"
1919
gnmda="0" gampa="0" />
2020

21-
<pinskyRinzelCA3CellDL id="pr2B" Is="-0.5" Id="2.49" gc="2.1" qd0="0"
21+
<pinskyRinzelCA3CellDL id="pr2B" Isoma="-0.5" Idend="2.49" gc="2.1" qd0="0"
2222
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
2323
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
2424
pp="0.5" Cm="3" alphac="2" betac="0.1"
2525
gnmda="0" gampa="0" />
2626

27-
<pinskyRinzelCA3CellDL id="pr2C" Is="2.5" Id="0" gc="2.1" qd0="0"
27+
<pinskyRinzelCA3CellDL id="pr2C" Isoma="2.5" Idend="0" gc="2.1" qd0="0"
2828
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
2929
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
3030
pp="0.5" Cm="3" alphac="2" betac="0.1"
3131
gnmda="0" gampa="0" />
3232

33-
<pinskyRinzelCA3CellDL id="pr2D" Is="2.5" Id="0" gc="10.5" qd0="0"
33+
<pinskyRinzelCA3CellDL id="pr2D" Isoma="2.5" Idend="0" gc="10.5" qd0="0"
3434
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
3535
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
3636
pp="0.5" Cm="3" alphac="2" betac="0.1"
3737
gnmda="0" gampa="0" />
3838

39-
<pinskyRinzelCA3CellDL id="pr2E" Is="-0.5" Id="2" gc="1.425" qd0="0.14"
39+
<pinskyRinzelCA3CellDL id="pr2E" Isoma="-0.5" Idend="2" gc="1.425" qd0="0.14"
4040
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
4141
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
4242
pp="0.5" Cm="3" alphac="2" betac="0.1"

‎NeuroML2/LEMS_Dimensionless/LEMS_Figure3DL.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
<Include file="pinskyRinzelCA3CellDL.xml"/>
1212

13-
<pinskyRinzelCA3CellDL id="prA" Is="0.75" gnmda="0" gc="2.1" qd0="0"
13+
<pinskyRinzelCA3CellDL id="prA" Isoma="0.75" gnmda="0" gc="2.1" qd0="0"
1414
gLs="0.1" gLd="0.1" gNa="30" gKdr="15"
1515
gCa="10" gKahp="0.8" gKC="15" VNa="60" VCa="80" VK="-75" VL="-60"
1616
pp="0.5" Cm="3" alphac="2" betac="0.1"
17-
Id="0" gampa="0" />
17+
Idend="0" gampa="0" />
1818

1919
<network id="net1">
2020
<population id="pr1pop" component="prA" size="1"/>
@@ -26,6 +26,7 @@
2626
<Display id="Fig3VsVd" title="Figure 3 Vs and Vd" timeScale="1ms" xmin="80" xmax="130" ymin="-70" ymax="30">
2727
<Line id="Vs" quantity="pr1pop[0]/Vs" scale="1" color="#00FF00" timeScale="1ms"/>
2828
<Line id="Vd" quantity="pr1pop[0]/Vd" scale="1" color="#FF00FF" timeScale="1ms"/>
29+
<Line id="V" quantity="pr1pop[0]/V" scale="1" color="#FF0000" timeScale="1ms"/>
2930
</Display>
3031

3132
<Display id="Fig3Ca" title="Figure 3 Ca" timeScale="1ms" xmin="80" xmax="130" ymin="-20" ymax="420">

‎NeuroML2/LEMS_Dimensionless/pinskyRinzelCA3CellDL.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
extends="baseCellMembPotDL"
1717
description="Preliminary version of Pinsky Rinzel model. Still in development!!">
1818

19-
<!-- baseCellMembPotDL compatibility -->
20-
<Exposure name="V" dimension="none"/>
19+
<!-- baseCellMembPotDL compatibility
20+
<Exposure name="V" dimension="none"/> -->
2121

22-
<Parameter name="Is" dimension="none"/>
22+
<Parameter name="Isoma" dimension="none"/>
2323
<Parameter name="gLs" dimension="none"/>
2424
<Parameter name="gLd" dimension="none"/>
2525
<Parameter name="gNa" dimension="none"/>
@@ -37,7 +37,7 @@
3737
<Parameter name="alphac" dimension="none"/>
3838
<Parameter name="betac" dimension="none"/>
3939

40-
<Parameter name="Id" dimension="none"/>
40+
<Parameter name="Idend" dimension="none"/>
4141
<Parameter name="gnmda" dimension="none"/>
4242
<Parameter name="gampa" dimension="none"/>
4343
<Parameter name="qd0" dimension="none"/>
@@ -113,7 +113,7 @@
113113
<Case value="Cad/250"/>
114114
</ConditionalDerivedVariable>
115115

116-
<DerivedVariable name="V" dimension="none" exposure="V" value="Vd"/>
116+
<!--<DerivedVariable name="V" dimension="none" exposure="V" value="Vd"/>-->
117117

118118
<!--
119119
alphacd(v)=(1.0-heav(v+10.0))*exp((v+50.0)/11-(v+53.5)/27)/18.975+heav(v+10.0)*2.0*exp((-53.5-v)/27.0)
@@ -129,18 +129,18 @@
129129
-->
130130

131131
<ConditionalDerivedVariable name="alphacd_Vd" dimension="none">
132-
<Case condition="V .lt. -10" value="exp((V+50.0)/11-(V+53.5)/27)/18.975"/>
133-
<Case value="2.0*exp((-53.5-V)/27.0)"/>
132+
<Case condition="Vd .lt. -10" value="exp((Vd+50.0)/11-(Vd+53.5)/27)/18.975"/>
133+
<Case value="2.0*exp((-53.5-Vd)/27.0)"/>
134134
</ConditionalDerivedVariable>
135135

136136

137137
<ConditionalDerivedVariable name="betacd_Vd" dimension="none">
138-
<Case condition="V .lt. -10" value="(2.0*exp((-53.5-V)/27.0)-alphacd_Vd)"/>
138+
<Case condition="Vd .lt. -10" value="(2.0*exp((-53.5-Vd)/27.0)-alphacd_Vd)"/>
139139
<Case value="0"/>
140140
</ConditionalDerivedVariable>
141141

142-
<TimeDerivative variable="Vs" value="(-gLs*(Vs-VL)-gNa*(Minfs_Vs^2)*hs*(Vs-VNa)-gKdr*ns*(Vs-VK)+(gc/pp)*(Vd-Vs)+Is/pp)/ (Cm * MSEC)"/>
143-
<TimeDerivative variable="Vd" value="(Id/(1.0-pp)-Isyn/(1.0-pp)-gLd*(Vd-VL)-ICad-gKahp*qd*(Vd-VK)-gKC*cd*chid*(Vd-VK)+(gc*(Vs-Vd))/(1.0-pp))/ (Cm * MSEC)"/>
142+
<TimeDerivative variable="Vs" value="(-gLs*(Vs-VL)-gNa*(Minfs_Vs^2)*hs*(Vs-VNa)-gKdr*ns*(Vs-VK)+(gc/pp)*(Vd-Vs)+Isoma/pp)/ (Cm * MSEC)"/>
143+
<TimeDerivative variable="Vd" value="(Idend/(1.0-pp)-Isyn/(1.0-pp)-gLd*(Vd-VL)-ICad-gKahp*qd*(Vd-VK)-gKC*cd*chid*(Vd-VK)+(gc*(Vs-Vd))/(1.0-pp))/ (Cm * MSEC)"/>
144144
<TimeDerivative variable="Cad" value="(-0.13*ICad-0.075*Cad) / MSEC"/>
145145
<TimeDerivative variable="hs" value="(alphahs_Vs-(alphahs_Vs+betahs_Vs)*hs) / MSEC"/>
146146
<TimeDerivative variable="ns" value="(alphans_Vs-(alphans_Vs+betans_Vs)*ns) / MSEC"/>

0 commit comments

Comments
 (0)