Changeset 34526

Timestamp:

Oct 7, 2012, 3:16:45 PM (14 years ago)

Author:

eugene

Message:

fix spline function to build correctly

Location:

branches/eam_branches/ipp-20120905/Ohana/src/opihi

Files:

• cmd.data/spline.c (modified) (2 diffs)
• cmd.data/spline_commands.c (modified) (2 diffs)
• lib.data/Makefile (modified) (1 diff)
• lib.data/SplineOps.c (modified) (1 diff)

branches/eam_branches/ipp-20120905/Ohana/src/opihi/cmd.data/spline.c

@@ -2 +2 @@
 
 int spline_list (int argc, char **argv);
-int spline_init (int argc, char **argv);
 int spline_create (int argc, char **argv);
+int spline_apply (int argc, char **argv);
 int spline_delete (int argc, char **argv);
 int spline_getspline (int argc, char **argv);
-int spline_listspline (int argc, char **argv);
-int spline_shuffle (int argc, char **argv);
-int spline_npages (int argc, char **argv);
-int spline_newpage (int argc, char **argv);
-int spline_getpage (int argc, char **argv);
-int spline_delpage (int argc, char **argv);
-int spline_listpage (int argc, char **argv);
-int spline_setword (int argc, char **argv);
-int spline_getword (int argc, char **argv);
 
 static Command spline_commands[] = {
   {1, "list",       spline_list,       "list splines"},
-  {1, "init",       spline_init,       "initialize a spline"},
   {1, "create",     spline_create,     "create a spline"},
+  {1, "apply",      spline_apply,      "apply a spline"},
   {1, "delete",     spline_delete,     "delete a spline"},
 };
@@ -30 +21 @@
     gprint (GP_ERR, "USAGE: spline (command)\n");
     gprint (GP_ERR, "    spline list                                    : list splines\n");
-    gprint (GP_ERR, "    spline init     (spline)                       : removes all pages from spline\n");
     gprint (GP_ERR, "    spline create   (spline)                       : create a spline\n");
     gprint (GP_ERR, "    spline delete   (spline)                       : delete a spline\n");

branches/eam_branches/ipp-20120905/Ohana/src/opihi/cmd.data/spline_commands.c

@@ -31 +31 @@
   Spline *myspline = CreateSpline (argv[1], xvec->Nelements);
 
-  for (i = 0; i < xvec->elements; i++) {
-    myspline->xk[i] = xvec->elements[i];
-    myspline->yk[i] = yvec->elements[i];
+  for (i = 0; i < xvec->Nelements; i++) {
+    myspline->xk[i] = xvec->elements.Flt[i];
+    myspline->yk[i] = yvec->elements.Flt[i];
   }    
 
@@ -61 +61 @@
   ResetVector (yvec, OPIHI_FLT, xvec->Nelements);
 
-  for (i = 0; i < xvec->elements; i++) {
-    opihi_flt value = spline_apply_dbl (myspline->xk, myspline->yk, myspline->y2, myspline->Nknots, xvec->elements[i]);
-    yvec->elements[i] = value;;
+  for (i = 0; i < xvec->Nelements; i++) {
+    opihi_flt value = spline_apply_dbl (myspline->xk, myspline->yk, myspline->y2, myspline->Nknots, xvec->elements.Flt[i]);
+    yvec->elements.Flt[i] = value;
   }    
 

branches/eam_branches/ipp-20120905/Ohana/src/opihi/lib.data/Makefile

@@ -23 +23 @@
 $(SDIR)/bracket.$(ARCH).o               \
 $(SDIR)/spline.$(ARCH).o                \
+$(SDIR)/SplineOps.$(ARCH).o             \
 $(SDIR)/mrqmin.$(ARCH).o                \
 $(SDIR)/mrq2dmin.$(ARCH).o              \

branches/eam_branches/ipp-20120905/Ohana/src/opihi/lib.data/SplineOps.c

@@ -30 +30 @@
 
     spline[0].Nknots = Nknots;
-    spline[0].NKNOTS = Nknots;
-    ALLOCATE (spline[0].xk, opihi_flt, spline[0].NKNOTS);
-    ALLOCATE (spline[0].yk, opihi_flt, spline[0].NKNOTS);
-    ALLOCATE (spline[0].y2, opihi_flt, spline[0].NKNOTS);
-    memset (spline[0].xk, 0, spline[0].NKNOTS * sizeof(opihi_flt));
-    memset (spline[0].yk, 0, spline[0].NKNOTS * sizeof(opihi_flt));
-    memset (spline[0].y2, 0, spline[0].NKNOTS * sizeof(opihi_flt));
+    ALLOCATE (spline[0].xk, opihi_flt, spline[0].Nknots);
+    ALLOCATE (spline[0].yk, opihi_flt, spline[0].Nknots);
+    ALLOCATE (spline[0].y2, opihi_flt, spline[0].Nknots);
+    memset (spline[0].xk, 0, spline[0].Nknots * sizeof(opihi_flt));
+    memset (spline[0].yk, 0, spline[0].Nknots * sizeof(opihi_flt));
+    memset (spline[0].y2, 0, spline[0].Nknots * sizeof(opihi_flt));
 }
 
 void FreeSpline (Spline *spline) {
-
-    int i;
 
     free (spline[0].name);