Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Richert committed Aug 16, 2022
2 parents a3f3f6b + 26c9970 commit a89e4ee
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions model_templates/neural_mass_models/ik.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ ik_eta_op:
base: OperatorTemplate
equations:
- "r' = (Delta*k^2/(pi*C) + r*(k*(2.0*v - v_r - v_t) - g*s)) / C"
- "v' = (k*v*(v - v_r - v_t) + k*v_r*v_t + I_ext - u + g*s*(E_r - v) - (pi*C*r)^2/k) / C"
- "u' = a*(b*v - u) + d*r"
- "v' = (k*v*(v - v_r - v_t) + k*v_r*v_t + I_ext + eta - u + g*s*(E_r - v) - (pi*C*r)^2/k) / C"
- "u' = a*(b*(v-v_r) - u) + d*r"
- "s' = -s/tau_s + r_in"
variables:
r: output(0.0)
v: variable(-60.0)
u: variable(0.0)
s: variable(0.0)
Delta: 0.02
eta: 0.0
k: 1.0
C: 100.0
v_r: -70.0
Expand All @@ -64,7 +65,7 @@ ik_theta_op:
equations:
- "r' = (Delta*k^2*(v-v_r)/(pi*C) + r*(k*(2.0*v - v_r - v_t) - g*s)) / C"
- "v' = (k*v*(v - v_r - v_t) + k*v_r*v_t + I_ext - u + g*s*(E_r - v) - pi*C*r*(Delta + pi*C*r/k)) / C"
- "u' = a*(b*v - u) + d*r"
- "u' = a*(b*(v-v_r) - u) + d*r"
- "s' = -s/tau_s + r_in"
variables:
r: output(0.0)
Expand Down

0 comments on commit a89e4ee

Please sign in to comment.