Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Make vecst mod compat w cpp compiler (nrn90) #2

Merged
merged 3 commits into from
May 27, 2022
Merged

Make vecst mod compat w cpp compiler (nrn90) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc4e28c
Make vecst compat w cpp compiler (nrn90)
ferdonline May 16, 2022
afeb72c
Fix for matrix.mod. Add revision entry to README
ferdonline May 18, 2022
f5b6e62
Cleanup for merge.
olupton May 20, 2022
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: 6 additions & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,12 @@ I also have not incorporated the 'p' variable which sets the dendrite/soma
area ratio. It is called pp and set to 0.5 but not incorporated in the geometry
setting routines.

## Changelog

20170914 A vecst.mod from Ruth Betterton derived from Wang Buzaki's
vecst.mod makes model work under mswin.
vecst.mod makes model work under mswin.

20210222 Instructions for running with CoreNEURON from Pramod Kumbhar.

20220516 Updated MOD files to contain valid C++ and be compatible with the
upcoming versions 8.2 and 9.0 of NEURON.
15 changes: 10 additions & 5 deletions matrix.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ ENDCOMMENT
NEURON {
SUFFIX nothing
}

VERBATIM
#ifndef NRN_VERSION_GTEQ_8_2_0
extern double hoc_call_func(Symbol*, int narg);
#endif
ENDVERBATIM

PARAMETER {
MATRIX_INSTALLED=0
Expand Down Expand Up @@ -84,7 +90,6 @@ VERBATIM
static double spltp(void* vv) {
int ii, jj, nstpr, nstpo, nw, npr, npo, flag, cnt;
double *stpr, *stpo, *w, *pr, *po;
extern double hoc_call_func(Symbol*, int narg);

char func[4] = "ltp";
Symbol* s = hoc_lookup(func);
Expand Down Expand Up @@ -301,9 +306,9 @@ static double mrow(void* vv) {
i = (int)*getarg(2);
cols = (int)*getarg(3); rows=ny/cols;
if (cols!=nx) {
nx=vector_buffer_size(vv);
nx=vector_buffer_size((IvocVect*)vv);
if (cols<=nx) {
vector_resize(vv, cols); nx=cols;
vector_resize((IvocVect*)vv, cols); nx=cols;
} else {
printf("%d > %d :: \n",cols,nx);
hoc_execerror("Vector max capacity too small in mrow", 0);
Expand All @@ -325,9 +330,9 @@ static double mcol(void* vv) {
j = (int)*getarg(2);
cols = (int)*getarg(3); rows=ny/cols;
if (rows!=nx) {
nx=vector_buffer_size(vv);
nx=vector_buffer_size((IvocVect*)vv);
if (rows<=nx) {
vector_resize(vv, rows); nx=rows;
vector_resize((IvocVect*)vv, rows); nx=rows;
} else {
printf("%d > %d :: ",rows,nx);
hoc_execerror("Vector max capacity too small in mcol ", 0);
Expand Down
50 changes: 27 additions & 23 deletions vecst.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,16 @@ VERBATIM
// obsolete #include <values.h> /* contains MAXLONG */
#include <limits.h> /* LONG_MAX replaces MAXLONG */
#include <time.h>

#ifndef NRN_VERSION_GTEQ_8_2_0
extern double* hoc_pgetarg();
extern double hoc_call_func(Symbol*, int narg);
extern FILE* hoc_obj_file_arg(int narg);
extern void vector_resize();
extern int vector_instance_px();
extern void* vector_arg();
extern double hoc_epsilon;
#endif

/* Below added by RTB 170913. Exerpt taken from changes made by Michael Hines
to Buzsaki Wang 1996, modelDB Accession:26997 */
Expand All @@ -72,17 +75,17 @@ extern double hoc_epsilon;
#include <limits.h>
#define MAXLONG LONG_MAX
#endif

/* some machines do not have drand48 and srand48 so use the implementation
at the end of this file */
extern double my_drand48();
extern void my_srand48();
double my_drand48();
void my_srand48(long seedval);
#undef drand48
#undef srand48
#define drand48 my_drand48
#define srand48 my_srand48

extern double drand48();
// end of exerpt
// end of excerpt

ENDVERBATIM

Expand Down Expand Up @@ -331,7 +334,7 @@ static double fewind(void* vv) {
for (j=0;j<num;j++) {
for (i=0;i<ni;i++) x[i]=vvo[j][scr[i]];
for (i=0;i<ni;i++) vvo[j][i]=x[i];
vv=vector_arg(j+2); vector_resize(vv, ni);
vv=vector_arg(j+2); vector_resize((IvocVect*)vv, ni);
}
return ni;
}
Expand All @@ -343,7 +346,7 @@ VERBATIM
static double iwr(void* vv) {
int i, j, nx;
double *x;
FILE* f, *hoc_obj_file_arg();
FILE* f;
f = hoc_obj_file_arg(1);
nx = vector_instance_px(vv, &x);
if (nx>scrsz) {
Expand All @@ -364,7 +367,7 @@ VERBATIM
static double ird(void* vv) {
int i, j, nx, n;
double *x;
FILE* f, *hoc_obj_file_arg();
FILE* f;
f = hoc_obj_file_arg(1);
nx = vector_instance_px(vv, &x);
fread(&n,sizeof(int),1,f); // size
Expand All @@ -374,9 +377,9 @@ static double ird(void* vv) {
scr=(int *)ecalloc(scrsz, sizeof(int));
}
if (n!=nx) {
nx=vector_buffer_size(vv);
nx=vector_buffer_size((IvocVect*)vv);
if (n<=nx) {
vector_resize(vv, n); nx=n;
vector_resize((IvocVect*)vv, n); nx=n;
} else {
printf("%d > %d :: ",n,nx);
hoc_execerror("Vector max capacity too small for ird ", 0);
Expand All @@ -395,16 +398,16 @@ static double insct(void* vv) {
int i, j, k, nx, nv1, nv2, maxsz;
double *x, *v1, *v2;
nx = vector_instance_px(vv, &x);
maxsz=vector_buffer_size(vv);
vector_resize(vv, maxsz);
maxsz=vector_buffer_size((IvocVect*)vv);
vector_resize((IvocVect*)vv, maxsz);
nv1 = vector_arg_px(1, &v1);
nv2 = vector_arg_px(2, &v2);
for (i=0,k=0;i<nv1&&k<maxsz;i++) for (j=0;j<nv2&&k<maxsz;j++) if (v1[i]==v2[j]) {
x[k++]=v1[i]; } /* v1[i] found in both vectors */
if (k==maxsz) {
printf("\tinsct WARNING: ran out of room: %d\n",k);
for (;i<nv1;i++,j=0) for (;j<nv2;j++) if (v1[i]==v2[j]) k++;
} else { vector_resize(vv, k); }
} else { vector_resize((IvocVect*)vv, k); }
return (double)k;
}
ENDVERBATIM
Expand All @@ -426,6 +429,7 @@ static double cvlv(void* vv) {
if (k>0 && k<nsrc-1) x[i]+=filt[j]*src[k];
}
}
return 0.;
}
ENDVERBATIM

Expand All @@ -445,6 +449,7 @@ static double intrp(void* vv) {
for (i=la+1; i<lb; i++) x[i]= a + (b-a)/(lb-la)*(i-la);
a=b; la=lb;
}
return 0.;
}
ENDVERBATIM

Expand Down Expand Up @@ -484,7 +489,7 @@ static double nind(void* vv) {
}
for (k=last+1;k<nx;k++,m++) { x[m]=vvo[j][k]; }
for (i=0;i<c;i++) vvo[j][i]=x[i];
vv=vector_arg(j+2); vector_resize(vv, c);
vv=vector_arg(j+2); vector_resize((IvocVect*)vv, c);
}
return c;
}
Expand All @@ -497,7 +502,7 @@ static double keyind(void* vv) {
int i, j, k, ni, nk, nv[10], num;
double *ind, *key, *vvo[10];
ni = vector_instance_px(vv, &ind); // vv is ind
for (i=0;ifarg(i);i++); i--; // drop back by one to get numarg()
for (i=0;ifarg(i);i++) {} i--; // drop back by one to get numarg()
if (i>10) hoc_execerror("ERR: keyind can only handle 9 vectors", 0);
num = i-1; /* number of vectors to be picked apart */
for (i=0;i<num;i++) {
Expand All @@ -519,7 +524,7 @@ static double keyind(void* vv) {
}
if (i==nk) ind[k++]=j; // all equal
}
vector_resize(vv, k);
vector_resize((IvocVect*)vv, k);
return k;
}
ENDVERBATIM
Expand Down Expand Up @@ -675,6 +680,7 @@ static double bpeval(void* vv) {
} else {
for (i=0;i<n;i++) vo[i]=outp[i]*(1.-1.*outp[i])*del[i];
}
return 0.;
}
ENDVERBATIM

Expand Down Expand Up @@ -748,8 +754,8 @@ static double xing(void* vv) {
nsrc = vector_arg_px(1, &src); th=0;
ntvec = vector_arg_px(2, &tvec); th=0;
th = *getarg(3);
maxsz=vector_buffer_size(vv);
vector_resize(vv, maxsz);
maxsz=vector_buffer_size((IvocVect*)vv);
vector_resize((IvocVect*)vv, maxsz);
if (nsrc!=ntvec) hoc_execerror("v.xing: vectors not all same size", 0);
for (i=0,f=0,j=0; i<nsrc; i++) {
if (src[i]>th) { /* ? passing thresh */
Expand All @@ -767,7 +773,7 @@ static double xing(void* vv) {
if (f==1) { f=0; } /* just passed going down */
}
}
vector_resize(vv, j);
vector_resize((IvocVect*)vv, j);
return (double)i;
}
ENDVERBATIM
Expand Down Expand Up @@ -960,9 +966,9 @@ static double smgs(void* vv) {

points = (int)((high-low)/step+hoc_epsilon);
if (nsum!=points) {
maxsz=vector_buffer_size(vv);
maxsz=vector_buffer_size((IvocVect*)vv);
if (points<=maxsz) {
vector_resize(vv, nsum); nsum=points;
vector_resize((IvocVect*)vv, nsum); nsum=points;
} else {
printf("%d > %d :: ",points,maxsz);
hoc_execerror("Vector max capacity too small in smgs ", 0);
Expand Down Expand Up @@ -1107,9 +1113,7 @@ next()
x[0] = LOW(p[0]);
}

void
my_srand48(seedval)
long seedval;
void my_srand48(long seedval)
{
SEED(X0, LOW(seedval), HIGH(seedval));
}
Expand Down