Changeset 33313 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

Timestamp:

Feb 20, 2012, 3:07:22 PM (14 years ago)

Author:

eugene

Message:

fixed up mextract -parallel to work correctly; parallel ops now fairly complete

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -185 +185 @@
   if (in[0].elements.Ptr) {
     if (in[0].type == OPIHI_FLT) {
-      ALLOCATE (out[0].elements.Flt, opihi_flt, out[0].Nelements);
+      ALLOCATE (out[0].elements.Flt, opihi_flt, MAX(1,out[0].Nelements));
       memcpy (out[0].elements.Flt, in[0].elements.Flt, out[0].Nelements*sizeof(opihi_flt));
       out[0].type = OPIHI_FLT;
     } else {
-      ALLOCATE (out[0].elements.Int, opihi_int, out[0].Nelements);
+      ALLOCATE (out[0].elements.Int, opihi_int, MAX(1,out[0].Nelements));
       memcpy (out[0].elements.Int, in[0].elements.Int, out[0].Nelements*sizeof(opihi_int));
       out[0].type = OPIHI_INT;
@@ -201 +201 @@
   out[0].Nelements = in[0].Nelements;
   if (type == OPIHI_FLT) {
-    ALLOCATE (out[0].elements.Flt, opihi_flt, out[0].Nelements);
+    ALLOCATE (out[0].elements.Flt, opihi_flt, MAX(1,out[0].Nelements));
     out[0].type = OPIHI_FLT;
   } else {
-    ALLOCATE (out[0].elements.Int, opihi_int, out[0].Nelements);
+    ALLOCATE (out[0].elements.Int, opihi_int, MAX(1,out[0].Nelements));
     out[0].type = OPIHI_INT;
   }
@@ -210 +210 @@
 }
 
-// ResetVector (vecx, OPIHI_FLT, MAX (Npts, 1));
 int ResetVector (Vector *vec, char type, int Nelements) {
 
-  vec[0].Nelements = Nelements;
+  // a vector can only have >= 0 elements
+  vec[0].Nelements = MAX(Nelements,0);
   if (type == OPIHI_FLT) {
     REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1, Nelements));
@@ -227 +227 @@
 int SetVector (Vector *vec, char type, int Nelements) {
 
-  vec[0].Nelements = Nelements;
+  vec[0].Nelements = MAX(Nelements,0);
   if (type == OPIHI_FLT) {
-    ALLOCATE (vec[0].elements.Flt, opihi_flt, Nelements);
+    ALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,Nelements));
     vec[0].type = OPIHI_FLT;
   } else {
-    ALLOCATE (vec[0].elements.Int, opihi_int, Nelements);
+    ALLOCATE (vec[0].elements.Int, opihi_int, MAX(1,Nelements));
     vec[0].type = OPIHI_INT;
   }