From b5bc397c55b6426d1ba95918c2eddd297b799213 Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 17 May 2022 17:32:40 +0200 Subject: [PATCH 1/5] Added changes from zip file --- bg | 0 family | 0 init.hoc | 0 intrepidjob.sh | 0 intrepidrun | 0 intrepidruns | 0 invl.hoc | 0 invlfire.mod | 0 movie.hoc | 0 net.hoc | 0 perfrun.hoc | 0 pick | 0 pltq.hoc | 0 13 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bg mode change 100644 => 100755 family mode change 100644 => 100755 init.hoc mode change 100644 => 100755 intrepidjob.sh mode change 100644 => 100755 intrepidrun mode change 100644 => 100755 intrepidruns mode change 100644 => 100755 invl.hoc mode change 100644 => 100755 invlfire.mod mode change 100644 => 100755 movie.hoc mode change 100644 => 100755 net.hoc mode change 100644 => 100755 perfrun.hoc mode change 100644 => 100755 pick mode change 100644 => 100755 pltq.hoc diff --git a/bg b/bg old mode 100644 new mode 100755 diff --git a/family b/family old mode 100644 new mode 100755 diff --git a/init.hoc b/init.hoc old mode 100644 new mode 100755 diff --git a/intrepidjob.sh b/intrepidjob.sh old mode 100644 new mode 100755 diff --git a/intrepidrun b/intrepidrun old mode 100644 new mode 100755 diff --git a/intrepidruns b/intrepidruns old mode 100644 new mode 100755 diff --git a/invl.hoc b/invl.hoc old mode 100644 new mode 100755 diff --git a/invlfire.mod b/invlfire.mod old mode 100644 new mode 100755 diff --git a/movie.hoc b/movie.hoc old mode 100644 new mode 100755 diff --git a/net.hoc b/net.hoc old mode 100644 new mode 100755 diff --git a/perfrun.hoc b/perfrun.hoc old mode 100644 new mode 100755 diff --git a/pick b/pick old mode 100644 new mode 100755 diff --git a/pltq.hoc b/pltq.hoc old mode 100644 new mode 100755 From 5a70f20d1eecba648fd874abb2db34ebf1c76d9d Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 17 May 2022 17:37:40 +0200 Subject: [PATCH 2/5] Fixed invlfire.mod for NEURON 9.0.0, 8.2.0, 8.1.0 --- invlfire.mod | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/invlfire.mod b/invlfire.mod index 21d96b9..c5d123e 100755 --- a/invlfire.mod +++ b/invlfire.mod @@ -15,6 +15,16 @@ NEURON { RANGE noutput, ninput : count number of spikes generated and coming in } +VERBATIM +#ifndef NRN_VERSION_GTEQ_8_2_0 +extern void* nrn_random_arg(int); +extern double nrn_random_pick(void*); +#define RANDCAST +#else +#define RANDCAST (Rand*) +#endif +ENDVERBATIM + PARAMETER { tau = 5 (ms) <1e-9,1e9> invl = 10 (ms) <1e-9,1e9> : varies if r is non-nil @@ -77,11 +87,10 @@ FUNCTION firetime()(ms) { : m < 1 and minf > 1 PROCEDURE specify_invl() { VERBATIM { - extern double nrn_random_pick(void*); if (!_p_r) { return 0.; } - invl = nrn_random_pick((void*)_p_r); + invl = nrn_random_pick(RANDCAST _p_r); if (t >= burst_start && t <= burst_stop) { invl *= burst_factor; } @@ -93,7 +102,6 @@ ENDVERBATIM PROCEDURE set_rand() { VERBATIM { - extern void* nrn_random_arg(int); void** ppr; ppr = (void**)(&(_p_r)); *ppr = nrn_random_arg(1); From 108ff6cea88c556b42bc506a4a16ec9d176006cd Mon Sep 17 00:00:00 2001 From: Ioannis Magkanaris Date: Tue, 17 May 2022 18:06:23 +0200 Subject: [PATCH 3/5] Added changelog in readme --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 9e89feb..d79665c 100644 --- a/README +++ b/README @@ -16,3 +16,4 @@ However the MPI multisend implementation can be used on any MPI installed system. In particular the two-phase exchange method may be useful. The exchange methods are implemented mostly in src/nrniv/bgpdma.cpp . +20220517 Edited invlfire.mod to support NEURON versions <8.1.0, 8.2.0 and 9.0.0. -NEURON Developers \ No newline at end of file From 88720ac2bfb26a8b5e713a8600b8d9b25c63df0e Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Mon, 23 May 2022 11:23:45 +0200 Subject: [PATCH 4/5] Cleanup for merge. --- README | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README b/README index d79665c..612c9d0 100644 --- a/README +++ b/README @@ -16,4 +16,7 @@ However the MPI multisend implementation can be used on any MPI installed system. In particular the two-phase exchange method may be useful. The exchange methods are implemented mostly in src/nrniv/bgpdma.cpp . -20220517 Edited invlfire.mod to support NEURON versions <8.1.0, 8.2.0 and 9.0.0. -NEURON Developers \ No newline at end of file +Changelog +--------- +2022-05: Updated MOD files to contain valid C++ and be compatible with the + upcoming versions 8.2 and 9.0 of NEURON. From 682ee1994444531a8406ddf35c7ca7f269590811 Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Sat, 28 May 2022 04:55:23 +0200 Subject: [PATCH 5/5] revert permission changes --- bg | 0 family | 0 init.hoc | 0 intrepidjob.sh | 0 intrepidrun | 0 intrepidruns | 0 invl.hoc | 0 movie.hoc | 0 net.hoc | 0 perfrun.hoc | 0 pick | 0 pltq.hoc | 0 12 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 bg mode change 100755 => 100644 family mode change 100755 => 100644 init.hoc mode change 100755 => 100644 intrepidjob.sh mode change 100755 => 100644 intrepidrun mode change 100755 => 100644 intrepidruns mode change 100755 => 100644 invl.hoc mode change 100755 => 100644 movie.hoc mode change 100755 => 100644 net.hoc mode change 100755 => 100644 perfrun.hoc mode change 100755 => 100644 pick mode change 100755 => 100644 pltq.hoc diff --git a/bg b/bg old mode 100755 new mode 100644 diff --git a/family b/family old mode 100755 new mode 100644 diff --git a/init.hoc b/init.hoc old mode 100755 new mode 100644 diff --git a/intrepidjob.sh b/intrepidjob.sh old mode 100755 new mode 100644 diff --git a/intrepidrun b/intrepidrun old mode 100755 new mode 100644 diff --git a/intrepidruns b/intrepidruns old mode 100755 new mode 100644 diff --git a/invl.hoc b/invl.hoc old mode 100755 new mode 100644 diff --git a/movie.hoc b/movie.hoc old mode 100755 new mode 100644 diff --git a/net.hoc b/net.hoc old mode 100755 new mode 100644 diff --git a/perfrun.hoc b/perfrun.hoc old mode 100755 new mode 100644 diff --git a/pick b/pick old mode 100755 new mode 100644 diff --git a/pltq.hoc b/pltq.hoc old mode 100755 new mode 100644