Skip to content

Commit

Permalink
Regenerated
Browse files Browse the repository at this point in the history
  • Loading branch information
pgleeson committed Mar 20, 2024
1 parent 6ceb5de commit 564eced
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 14 deletions.
11 changes: 9 additions & 2 deletions NetPyNE/ACnet/LEMS_MediumNet_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

class NetPyNESimulation():

def __init__(self, tstop=500.0, dt=0.01, seed=123456789, save_json=False):
def __init__(self, tstop=500.0, dt=0.01, seed=123456789, save_json=False, abs_tol=None):

self.setup_start = time.time()

Expand Down Expand Up @@ -89,6 +89,13 @@ def __init__(self, tstop=500.0, dt=0.01, seed=123456789, save_json=False):
self.simConfig.duration = self.simConfig.tstop = tstop # Duration of the simulation, in ms
self.simConfig.dt = dt # Internal integration timestep to use

# cvode
if abs_tol is not None:
self.simConfig.cvode_active = True
self.simConfig.cvode_atol = abs_tol
else:
self.simConfig.cvode_active = False

# Seeds for randomizers (connectivity, input stimulation and cell locations)
# Note: locations and connections should be fully specified by the structure of the NeuroML,
# so seeds for conn & loc shouldn't affect networks structure/behaviour
Expand Down Expand Up @@ -1402,7 +1409,7 @@ def save_results(self):
save_json = '-json' in sys.argv
no_run = '-norun' in sys.argv

ns = NetPyNESimulation(tstop=500.0, dt=0.01, seed=123456789, save_json=save_json)
ns = NetPyNESimulation(tstop=500.0, dt=0.01, seed=123456789, save_json=save_json, abs_tol=None)

if not no_run:
ns.run()
Expand Down
11 changes: 9 additions & 2 deletions NetPyNE/GapJunctions/LEMS_GJ_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

class NetPyNESimulation():

def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False):
def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False, abs_tol=None):

self.setup_start = time.time()

Expand Down Expand Up @@ -63,6 +63,13 @@ def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False):
self.simConfig.duration = self.simConfig.tstop = tstop # Duration of the simulation, in ms
self.simConfig.dt = dt # Internal integration timestep to use

# cvode
if abs_tol is not None:
self.simConfig.cvode_active = True
self.simConfig.cvode_atol = abs_tol
else:
self.simConfig.cvode_active = False

# Seeds for randomizers (connectivity, input stimulation and cell locations)
# Note: locations and connections should be fully specified by the structure of the NeuroML,
# so seeds for conn & loc shouldn't affect networks structure/behaviour
Expand Down Expand Up @@ -200,7 +207,7 @@ def save_results(self):
save_json = '-json' in sys.argv
no_run = '-norun' in sys.argv

ns = NetPyNESimulation(tstop=700.0, dt=0.01, seed=123456789, save_json=save_json)
ns = NetPyNESimulation(tstop=700.0, dt=0.01, seed=123456789, save_json=save_json, abs_tol=None)

if not no_run:
ns.run()
Expand Down
11 changes: 9 additions & 2 deletions NetPyNE/LEMS_2007One_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

class NetPyNESimulation():

def __init__(self, tstop=520.0, dt=0.001, seed=123456789, save_json=False):
def __init__(self, tstop=520.0, dt=0.001, seed=123456789, save_json=False, abs_tol=None):

self.setup_start = time.time()

Expand All @@ -51,6 +51,13 @@ def __init__(self, tstop=520.0, dt=0.001, seed=123456789, save_json=False):
self.simConfig.duration = self.simConfig.tstop = tstop # Duration of the simulation, in ms
self.simConfig.dt = dt # Internal integration timestep to use

# cvode
if abs_tol is not None:
self.simConfig.cvode_active = True
self.simConfig.cvode_atol = abs_tol
else:
self.simConfig.cvode_active = False

# Seeds for randomizers (connectivity, input stimulation and cell locations)
# Note: locations and connections should be fully specified by the structure of the NeuroML,
# so seeds for conn & loc shouldn't affect networks structure/behaviour
Expand Down Expand Up @@ -175,7 +182,7 @@ def save_results(self):
save_json = '-json' in sys.argv
no_run = '-norun' in sys.argv

ns = NetPyNESimulation(tstop=520.0, dt=0.001, seed=123456789, save_json=save_json)
ns = NetPyNESimulation(tstop=520.0, dt=0.001, seed=123456789, save_json=save_json, abs_tol=None)

if not no_run:
ns.run()
Expand Down
11 changes: 9 additions & 2 deletions NetPyNE/TwoCells/LEMS_TwoCell_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

class NetPyNESimulation():

def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False):
def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False, abs_tol=None):

self.setup_start = time.time()

Expand Down Expand Up @@ -82,6 +82,13 @@ def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False):
self.simConfig.duration = self.simConfig.tstop = tstop # Duration of the simulation, in ms
self.simConfig.dt = dt # Internal integration timestep to use

# cvode
if abs_tol is not None:
self.simConfig.cvode_active = True
self.simConfig.cvode_atol = abs_tol
else:
self.simConfig.cvode_active = False

# Seeds for randomizers (connectivity, input stimulation and cell locations)
# Note: locations and connections should be fully specified by the structure of the NeuroML,
# so seeds for conn & loc shouldn't affect networks structure/behaviour
Expand Down Expand Up @@ -435,7 +442,7 @@ def save_results(self):
save_json = '-json' in sys.argv
no_run = '-norun' in sys.argv

ns = NetPyNESimulation(tstop=700.0, dt=0.01, seed=123456789, save_json=save_json)
ns = NetPyNESimulation(tstop=700.0, dt=0.01, seed=123456789, save_json=save_json, abs_tol=None)

if not no_run:
ns.run()
Expand Down
11 changes: 9 additions & 2 deletions NetPyNE/UI/LEMS_HHSimple_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

class NetPyNESimulation():

def __init__(self, tstop=450.0, dt=0.05, seed=123456789, save_json=False):
def __init__(self, tstop=450.0, dt=0.05, seed=123456789, save_json=False, abs_tol=None):

self.setup_start = time.time()

Expand All @@ -51,6 +51,13 @@ def __init__(self, tstop=450.0, dt=0.05, seed=123456789, save_json=False):
self.simConfig.duration = self.simConfig.tstop = tstop # Duration of the simulation, in ms
self.simConfig.dt = dt # Internal integration timestep to use

# cvode
if abs_tol is not None:
self.simConfig.cvode_active = True
self.simConfig.cvode_atol = abs_tol
else:
self.simConfig.cvode_active = False

# Seeds for randomizers (connectivity, input stimulation and cell locations)
# Note: locations and connections should be fully specified by the structure of the NeuroML,
# so seeds for conn & loc shouldn't affect networks structure/behaviour
Expand Down Expand Up @@ -181,7 +188,7 @@ def save_results(self):
save_json = '-json' in sys.argv
no_run = '-norun' in sys.argv

ns = NetPyNESimulation(tstop=450.0, dt=0.05, seed=123456789, save_json=save_json)
ns = NetPyNESimulation(tstop=450.0, dt=0.05, seed=123456789, save_json=save_json, abs_tol=None)

if not no_run:
ns.run()
Expand Down
2 changes: 1 addition & 1 deletion NeuroML2/LEMS_HHSmall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--
This LEMS file has been automatically generated using PyNeuroML v1.1.14 (libNeuroML v0.5.8)
This LEMS file has been automatically generated using PyNeuroML v1.2.7 (libNeuroML v0.5.9)
-->

Expand Down
2 changes: 1 addition & 1 deletion NeuroML2/LEMS_HybridSmall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--
This LEMS file has been automatically generated using PyNeuroML v1.1.14 (libNeuroML v0.5.8)
This LEMS file has been automatically generated using PyNeuroML v1.2.7 (libNeuroML v0.5.9)
-->

Expand Down
2 changes: 1 addition & 1 deletion NeuroML2/LEMS_HybridTut.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--
This LEMS file has been automatically generated using PyNeuroML v1.1.14 (libNeuroML v0.5.8)
This LEMS file has been automatically generated using PyNeuroML v1.2.7 (libNeuroML v0.5.9)
-->

Expand Down
2 changes: 1 addition & 1 deletion NeuroML2/LEMS_M1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!--
This LEMS file has been automatically generated using PyNeuroML v1.1.14 (libNeuroML v0.5.8)
This LEMS file has been automatically generated using PyNeuroML v1.2.7 (libNeuroML v0.5.9)
-->

Expand Down

0 comments on commit 564eced

Please sign in to comment.