[Teem-commit] teem/src/push/test pusher.c,1.19,1.20

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src/push/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29743/test

Modified Files:
	pusher.c 
Log Message:
kind of working again 

Index: pusher.c
===================================================================
RCS file: /cvsroot/teem/teem/src/push/test/pusher.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pusher.c	14 Jan 2006 20:29:14 -0000	1.19
--- pusher.c	28 Mar 2006 11:48:59 -0000	1.20
***************
*** 33,42 ****
    
    char *outS[2];
!   int seed, numThread, numThing, snap, minIter, maxIter, singleBin,
      noDriftCorrect, tln, frenet, incr;
    pushContext *pctx;
    Nrrd *nin, *nPosIn, *nStnIn, *nPosOut, *nTenOut, *nStnOut;
!   double step, drag, preDrag, mass, scale, nudge, margin,
!     wall, minMeanVel, tlf[3];
    NrrdKernelSpec *ksp00, *ksp11;
    pushForce *force;
--- 33,41 ----
    
    char *outS[2];
!   int seed, threadNum, thingNum, snap, minIter, maxIter, singleBin,
      noDriftCorrect, tln, frenet, incr;
    pushContext *pctx;
    Nrrd *nin, *nPosIn, *nStnIn, *nPosOut, *nTenOut, *nStnOut;
!   double step, drag, preDrag, mass, scale, nudge, wall, minMeanVel, tlf[3];
    NrrdKernelSpec *ksp00, *ksp11;
    pushForce *force;
***************
*** 52,56 ****
               "connectivity/tractlet information for \"-pi\" nrrd",
               NULL, NULL, nrrdHestNrrd);
!   hestOptAdd(&hopt, "np", "# points", airTypeInt, 1, 1, &numThing, "100",
               "number of points to use in simulation");
    hestOptAdd(&hopt, "seed", "seed", airTypeInt, 1, 1, &seed, "42",
--- 51,55 ----
               "connectivity/tractlet information for \"-pi\" nrrd",
               NULL, NULL, nrrdHestNrrd);
!   hestOptAdd(&hopt, "np", "# points", airTypeInt, 1, 1, &thingNum, "100",
               "number of points to use in simulation");
    hestOptAdd(&hopt, "seed", "seed", airTypeInt, 1, 1, &seed, "42",
***************
*** 90,96 ****
    hestOptAdd(&hopt, "wall", "wall", airTypeDouble, 1, 1, &wall, "0.0",
               "spring constant of containing walls");
-   hestOptAdd(&hopt, "marg", "margin", airTypeDouble, 1, 1, &margin, "0.2",
-              "margin around [-1,1]^3 within which to allow points to "
-              "overflow, outside of which they're disallowed");
    hestOptAdd(&hopt, "mmv", "mean vel", airTypeDouble, 1, 1, &minMeanVel,
               "0.1", "minimum mean velocity that signifies convergence");
--- 89,92 ----
***************
*** 98,102 ****
               "if non-zero, number of iterations between which a snapshot "
               "is saved");
!   hestOptAdd(&hopt, "nt", "# threads", airTypeInt, 1, 1, &numThread, "1",
               "number of threads to run");
    hestOptAdd(&hopt, "k00", "kernel", airTypeOther, 1, 1, &ksp00,
--- 94,98 ----
               "if non-zero, number of iterations between which a snapshot "
               "is saved");
!   hestOptAdd(&hopt, "nt", "# threads", airTypeInt, 1, 1, &threadNum, "1",
               "number of threads to run");
    hestOptAdd(&hopt, "k00", "kernel", airTypeOther, 1, 1, &ksp00,
***************
*** 134,138 ****
    pctx->npos = nPosIn;
    pctx->nstn = nStnIn;
!   pctx->numThread = numThread;
    pctx->singleBin = singleBin;
    pctx->maxIter = maxIter;
--- 130,134 ----
    pctx->npos = nPosIn;
    pctx->nstn = nStnIn;
!   pctx->threadNum = threadNum;
    pctx->singleBin = singleBin;
    pctx->maxIter = maxIter;
***************
*** 146,150 ****
    pctx->tlSoft = tlf[1];
    pctx->tlStep = tlf[2];
!   pctx->tlNumStep = tln;
    pctx->tlFrenet = frenet;
    pctx->force = force;
--- 142,146 ----
    pctx->tlSoft = tlf[1];
    pctx->tlStep = tlf[2];
!   pctx->tlStepNum = tln;
    pctx->tlFrenet = frenet;
    pctx->force = force;
***************
*** 152,160 ****
    pctx->nudge = nudge;
    pctx->wall = wall;
-   pctx->margin = margin;
    pctx->minMeanVel = minMeanVel;
    pctx->snap = snap;
!   pctx->numThing = numThing;
!   pctx->numStage = 2;
    pctx->driftCorrect = !noDriftCorrect;
    pctx->verbose = 0;
--- 148,155 ----
    pctx->nudge = nudge;
    pctx->wall = wall;
    pctx->minMeanVel = minMeanVel;
    pctx->snap = snap;
!   pctx->thingNum = thingNum;
!   pctx->stageNum = 2;
    pctx->driftCorrect = !noDriftCorrect;
    pctx->verbose = 0;