Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Mod files valid for 9.0 and legacy NEURON #2

Merged
merged 4 commits into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions HCN.mod
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ INITIAL {
hys = hysinf
hyhtf = hyhtfinf
hyhts = hyhtsinf
VERBATIM
return 0;
ENDVERBATIM
}

PROCEDURE states() { :Computes state variables m, h, and n
Expand All @@ -122,10 +119,6 @@ PROCEDURE states() { :Computes state variables m, h, and n
hys = hys + hysexp*(hysinf-hys)
hyhtf = hyhtf + hyhtfexp*(hyhtfinf-hyhtf)
hyhts = hyhts + hyhtsexp*(hyhtsinf-hyhts)

VERBATIM
return 0;
ENDVERBATIM
}

LOCAL q10
Expand Down
7 changes: 0 additions & 7 deletions ichan2.mod
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,6 @@ INITIAL {
h = hinf
nf = nfinf
ns = nsinf

VERBATIM
return 0;
ENDVERBATIM
}

: discreticed versions of the differential equations, hence a PROCEDURE and not DERIVATIVE block
Expand All @@ -168,9 +164,6 @@ PROCEDURE states() { : Computes state variables m, h, and n
h = h + hexp*(hinf-h)
nf = nf + nfexp*(nfinf-nf)
ns = ns + nsexp*(nsinf-ns)
VERBATIM
return 0;
ENDVERBATIM
}

: moved this to assign block <ah>
Expand Down
7 changes: 6 additions & 1 deletion netstim125.mod
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,13 @@ FUNCTION invl(mean (ms)) (ms) {
}
}
VERBATIM
#ifndef NRN_VERSION_GTEQ_8_2_0
double nrn_random_pick(void* r);
void* nrn_random_arg(int argpos);
#define RANDCAST
#else
#define RANDCAST (Rand*)
#endif
ENDVERBATIM

FUNCTION erand() {
Expand All @@ -85,7 +90,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.negexp(1)
*/
_lerand = nrn_random_pick(_p_donotuse);
_lerand = nrn_random_pick(RANDCAST _p_donotuse);
}else{
/* only can be used in main thread */
if (_nt != nrn_threads) {
Expand Down
8 changes: 7 additions & 1 deletion netstimbox.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ INITIAL { : deactivated by default
FUNCTION invl(mean (ms)) (ms) {
}
VERBATIM
#ifndef NRN_VERSION_GTEQ_8_2_0
double nrn_random_pick(void* r);
void* nrn_random_arg(int argpos);
#define RANDCAST
#else
#define RANDCAST (Rand*)
#endif

ENDVERBATIM

FUNCTION erand() {
Expand All @@ -45,7 +51,7 @@ VERBATIM
: each instance. However, the corresponding hoc Random
: distribution MUST be set to Random.negexp(1)
*/
_lerand = nrn_random_pick(_p_donotuse);
_lerand = nrn_random_pick(RANDCAST _p_donotuse);
}else{
/* only can be used in main thread */
if (_nt != nrn_threads) {
Expand Down
4 changes: 3 additions & 1 deletion readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,7 @@ <h3> Other remarks</h3>
The bug was fixed to make the channel properly dependent on the current calcium concentration. See <br>
<a href="https://senselab.med.yale.edu/modeldb/showModel.cshtml?model=124513&file=/dentate_gyrus/CaBK.mod"> https://senselab.med.yale.edu/modeldb/showModel.cshtml?model=124513&file=/dentate_gyrus/CaBK.mod </a></p>

<h3>Changelog</h3>
2022-05: Updated MOD files to contain valid C++ and be compatible with the upcoming versions 8.2 and 9.0 of NEURON.
</body>
</html>
</html>