fix the tensor data setting for one case

jessdtate · jessdtate · commit 9c75cb04540a · 2016-07-05T00:49:45.000-06:00
diff --git a/src/Core/Algorithms/Legacy/Fields/FieldData/SetFieldData.cc b/src/Core/Algorithms/Legacy/Fields/FieldData/SetFieldData.cc
@@ -297,90 +297,125 @@ bool SetFieldDataAlgo::setvectordata(VField* ofield, DenseMatrixHandle data, siz
 
 bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, size_type numvals, size_type nrows, size_type ncols, size_type numnvals, size_type numevals) const
 {
+  
+  std::cout<<"settensordata"<<std::endl;
   /// Fill field with Tensor values
   /// Handle 6 by n data
   if ((ncols == 6) && (nrows == numvals))
   {
+      std::cout<<"rows, 6 elems"<<std::endl;
     Vector v[6];
     for (VMesh::index_type i = 0; i < numnvals; i++)
     {
       v[0] = (*data)(i, 0); v[1] = (*data)(i, 1);	v[2] = (*data)(i, 2);
       v[3] = (*data)(i, 3); v[4] = (*data)(i, 4);	v[5] = (*data)(i, 5);
       ofield->set_values(v, i);
+        std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
     }
     for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
     {
       v[0]=(* data)(i,0); v[1]=(* data)(i,1);	v[2]=(* data)(i,2);
       v[3]=(* data)(i,3); v[4]=(* data)(i,4);	v[5]=(* data)(i,5);
       ofield->set_evalues(v,i);
+        std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
     }
   }
   else if ((nrows == 6) && (ncols == numvals))
   {
+    std::cout<<"cols, 6 elems"<<std::endl;
+    
     Vector v[6];
     for (VMesh::index_type i = 0; i < numnvals; i++)
     {
       v[0] = (*data)(0, i); v[1] = (*data)(1, i);	v[2] = (*data)(2, i);
       v[3] = (*data)(3, i); v[4] = (*data)(4, i);	v[5] = (*data)(5, i);
       ofield->set_values(v, i);
+      std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
     }
     for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
     {
       v[0]=(* data)(0,i); v[1]=(* data)(1,i);	v[2]=(* data)(2,i);
       v[3]=(* data)(3,i); v[4]=(* data)(4,i);	v[5]=(* data)(5,i);
       ofield->set_evalues(v,i);
+      std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
     }
   }
   else if (((nrows == 1) && (ncols == 6)) || ((ncols == 1) && (nrows == 6)))
   {
     Vector v;
     if ((nrows == 1) && (ncols == 6)) { v[0] = (*data)(0, 0); v[1] = (*data)(0, 1); v[2] = (*data)(0, 2); v[3] = (*data)(0, 3); v[4] = (*data)(0, 4); v[5] = (*data)(0, 5); }
     if ((ncols == 1) && (nrows == 6)) { v[0] = (*data)(0, 0); v[1] = (*data)(1, 0); v[2] = (*data)(2, 0); v[3] = (*data)(3, 0); v[4] = (*data)(4, 0); v[5] = (*data)(5, 0); }
+    std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
     ofield->set_all_values(v);
   }
   /// Handle 9 by n data
   else if ((ncols == 9) && (nrows == numvals))
   {
+    std::cout<<"rows, 9 elems"<<std::endl;
     Vector v[9];
     for (VMesh::index_type i = 0; i < numnvals; i++)
     {
+      /*
       v[0] = (*data)(i, 0); v[1] = (*data)(i, 1);	v[2] = (*data)(i, 2);
       v[3] = (*data)(i, 3); v[4] = (*data)(i, 4);	v[5] = (*data)(i, 5);
       v[6] = (*data)(i, 6); v[7] = (*data)(i, 7);	v[8] = (*data)(i, 8);
       ofield->set_values(v, i);
+      std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
+       */
+      ofield->set_value(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)), i);
+      std::cout<<"nodes. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 8)<<std::endl;
     }
     for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
     {
+      /*
       v[0]=(* data)(i,0); v[1]=(* data)(i,1);	v[2]=(* data)(i,2);
       v[3]=(* data)(i,3); v[4]=(* data)(i,4);	v[5]=(* data)(i,5);
       v[6]=(* data)(i,6); v[7]=(* data)(i,7);	v[8]=(* data)(i,8);
       ofield->set_evalues(v,i);
+      std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
+       */
+      ofield->set_evalue(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)), i);
+      std::cout<<"elems. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 8)<<std::endl;
     }
   }
   else if ((nrows == 9) && (ncols == numvals))
   {
+    std::cout<<"cols, 9 elems"<<std::endl;
     Vector v[9];
     for (VMesh::index_type i = 0; i < numnvals; i++)
     {
-      v[0] = (*data)(0, i); v[1] = (*data)(1, i);	v[2] = (*data)(2, i);
-      v[3] = (*data)(3, i); v[4] = (*data)(4, i);	v[5] = (*data)(5, i);
-      v[6] = (*data)(6, i); v[7] = (*data)(7, i);	v[8] = (*data)(8, i);
-      ofield->set_values(v, i);
+      /*
+       v[0] = (*data)(i, 0); v[1] = (*data)(i, 1);	v[2] = (*data)(i, 2);
+       v[3] = (*data)(i, 3); v[4] = (*data)(i, 4);	v[5] = (*data)(i, 5);
+       v[6] = (*data)(i, 6); v[7] = (*data)(i, 7);	v[8] = (*data)(i, 8);
+       ofield->set_values(v, i);
+       std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
+       */
+      ofield->set_value(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)), i);
+      std::cout<<"nodes. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 8)<<std::endl;
     }
     for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
     {
-      v[0]=(* data)(0,i); v[1]=(* data)(1,i);	v[2]=(* data)(2,i);
-      v[3]=(* data)(3,i); v[4]=(* data)(4,i);	v[5]=(* data)(5,i);
-      v[6]=(* data)(6,i); v[7]=(* data)(7,i);	v[8]=(* data)(8,i);
-      ofield->set_evalues(v,i);
-    }
+      /*
+       v[0]=(* data)(i,0); v[1]=(* data)(i,1);	v[2]=(* data)(i,2);
+       v[3]=(* data)(i,3); v[4]=(* data)(i,4);	v[5]=(* data)(i,5);
+       v[6]=(* data)(i,6); v[7]=(* data)(i,7);	v[8]=(* data)(i,8);
+       ofield->set_evalues(v,i);
+       std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
+       */
+      ofield->set_evalue(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)), i);
+      std::cout<<"elems. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 8)<<std::endl;    }
   }
   else if (((nrows == 1) && (ncols == 9)) || ((ncols == 1) && (nrows == 9)))
   {
+    /*
     Vector v;
     if ((nrows == 1) && (ncols == 9)) { v[0] = (*data)(0, 0); v[1] = (*data)(0, 1); v[2] = (*data)(0, 2); v[3] = (*data)(0, 3); v[4] = (*data)(0, 4); v[5] = (*data)(0, 5); }
     if ((ncols == 1) && (nrows == 9)) { v[0] = (*data)(0, 0); v[1] = (*data)(1, 0); v[2] = (*data)(2, 0); v[3] = (*data)(3, 0); v[4] = (*data)(4, 0); v[5] = (*data)(5, 0); }
     ofield->set_all_values(v);
+        std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
+    */
+    ofield->set_all_values(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)));
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -297,90 +297,125 @@ bool SetFieldDataAlgo::setvectordata(VField* ofield, DenseMatrixHandle data, siz`
`297`	`297`
`298`	`298`	`bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, size_type numvals, size_type nrows, size_type ncols, size_type numnvals, size_type numevals) const`
`299`	`299`	`{`
	`300`	`+`
	`301`	`+ std::cout<<"settensordata"<<std::endl;`
`300`	`302`	`/// Fill field with Tensor values`
`301`	`303`	`/// Handle 6 by n data`
`302`	`304`	`if ((ncols == 6) && (nrows == numvals))`
`303`	`305`	`{`
	`306`	`+ std::cout<<"rows, 6 elems"<<std::endl;`
`304`	`307`	`Vector v[6];`
`305`	`308`	`for (VMesh::index_type i = 0; i < numnvals; i++)`
`306`	`309`	`{`
`307`	`310`	`v[0] = (data)(i, 0); v[1] = (data)(i, 1); v[2] = (*data)(i, 2);`
`308`	`311`	`v[3] = (data)(i, 3); v[4] = (data)(i, 4); v[5] = (*data)(i, 5);`
`309`	`312`	`ofield->set_values(v, i);`
	`313`	`+ std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;`
`310`	`314`	`}`
`311`	`315`	`for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)`
`312`	`316`	`{`
`313`	`317`	`v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);`
`314`	`318`	`v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);`
`315`	`319`	`ofield->set_evalues(v,i);`
	`320`	`+ std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;`
`316`	`321`	`}`
`317`	`322`	`}`
`318`	`323`	`else if ((nrows == 6) && (ncols == numvals))`
`319`	`324`	`{`
	`325`	`+ std::cout<<"cols, 6 elems"<<std::endl;`
	`326`	`+`
`320`	`327`	`Vector v[6];`
`321`	`328`	`for (VMesh::index_type i = 0; i < numnvals; i++)`
`322`	`329`	`{`
`323`	`330`	`v[0] = (data)(0, i); v[1] = (data)(1, i); v[2] = (*data)(2, i);`
`324`	`331`	`v[3] = (data)(3, i); v[4] = (data)(4, i); v[5] = (*data)(5, i);`
`325`	`332`	`ofield->set_values(v, i);`
	`333`	`+ std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;`
`326`	`334`	`}`
`327`	`335`	`for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)`
`328`	`336`	`{`
`329`	`337`	`v[0]=(* data)(0,i); v[1]=(* data)(1,i); v[2]=(* data)(2,i);`
`330`	`338`	`v[3]=(* data)(3,i); v[4]=(* data)(4,i); v[5]=(* data)(5,i);`
`331`	`339`	`ofield->set_evalues(v,i);`
	`340`	`+ std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;`
`332`	`341`	`}`
`333`	`342`	`}`
`334`	`343`	`else if (((nrows == 1) && (ncols == 6)) \|\| ((ncols == 1) && (nrows == 6)))`
`335`	`344`	`{`
`336`	`345`	`Vector v;`
`337`	`346`	`if ((nrows == 1) && (ncols == 6)) { v[0] = (data)(0, 0); v[1] = (data)(0, 1); v[2] = (data)(0, 2); v[3] = (data)(0, 3); v[4] = (data)(0, 4); v[5] = (data)(0, 5); }`
`338`	`347`	`if ((ncols == 1) && (nrows == 6)) { v[0] = (data)(0, 0); v[1] = (data)(1, 0); v[2] = (data)(2, 0); v[3] = (data)(3, 0); v[4] = (data)(4, 0); v[5] = (data)(5, 0); }`
	`348`	`+ std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;`
`339`	`349`	`ofield->set_all_values(v);`
`340`	`350`	`}`
`341`	`351`	`/// Handle 9 by n data`
`342`	`352`	`else if ((ncols == 9) && (nrows == numvals))`
`343`	`353`	`{`
	`354`	`+ std::cout<<"rows, 9 elems"<<std::endl;`
`344`	`355`	`Vector v[9];`
`345`	`356`	`for (VMesh::index_type i = 0; i < numnvals; i++)`
`346`	`357`	`{`
	`358`	`+ /*`
`347`	`359`	`v[0] = (data)(i, 0); v[1] = (data)(i, 1); v[2] = (*data)(i, 2);`
`348`	`360`	`v[3] = (data)(i, 3); v[4] = (data)(i, 4); v[5] = (*data)(i, 5);`
`349`	`361`	`v[6] = (data)(i, 6); v[7] = (data)(i, 7); v[8] = (*data)(i, 8);`
`350`	`362`	`ofield->set_values(v, i);`
	`363`	`+ std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;`
	`364`	`+ */`
	`365`	`+ ofield->set_value(Tensor((data)(i, 0),(data)(i, 1),(data)(i, 2),(data)(i, 3),(data)(i, 4),(data)(i, 8)), i);`
	`366`	`+ std::cout<<"nodes. vector = "<<(data)(i, 0)<<","<<(data)(i, 1)<<","<<(data)(i, 2)<<","<<(data)(i, 3)<<","<<(data)(i, 4)<<","<<(data)(i, 8)<<std::endl;`
`351`	`367`	`}`
`352`	`368`	`for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)`
`353`	`369`	`{`
	`370`	`+ /*`
`354`	`371`	`v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);`
`355`	`372`	`v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);`
`356`	`373`	`v[6]=(* data)(i,6); v[7]=(* data)(i,7); v[8]=(* data)(i,8);`
`357`	`374`	`ofield->set_evalues(v,i);`
	`375`	`+ std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;`
	`376`	`+ */`
	`377`	`+ ofield->set_evalue(Tensor((data)(i, 0),(data)(i, 1),(data)(i, 2),(data)(i, 3),(data)(i, 4),(data)(i, 8)), i);`
	`378`	`+ std::cout<<"elems. vector = "<<(data)(i, 0)<<","<<(data)(i, 1)<<","<<(data)(i, 2)<<","<<(data)(i, 3)<<","<<(data)(i, 4)<<","<<(data)(i, 8)<<std::endl;`
`358`	`379`	`}`
`359`	`380`	`}`
`360`	`381`	`else if ((nrows == 9) && (ncols == numvals))`
`361`	`382`	`{`
	`383`	`+ std::cout<<"cols, 9 elems"<<std::endl;`
`362`	`384`	`Vector v[9];`
`363`	`385`	`for (VMesh::index_type i = 0; i < numnvals; i++)`
`364`	`386`	`{`
`365`		`- v[0] = (data)(0, i); v[1] = (data)(1, i); v[2] = (*data)(2, i);`
`366`		`- v[3] = (data)(3, i); v[4] = (data)(4, i); v[5] = (*data)(5, i);`
`367`		`- v[6] = (data)(6, i); v[7] = (data)(7, i); v[8] = (*data)(8, i);`
`368`		`- ofield->set_values(v, i);`
	`387`	`+ /*`
	`388`	`+ v[0] = (data)(i, 0); v[1] = (data)(i, 1); v[2] = (*data)(i, 2);`
	`389`	`+ v[3] = (data)(i, 3); v[4] = (data)(i, 4); v[5] = (*data)(i, 5);`
	`390`	`+ v[6] = (data)(i, 6); v[7] = (data)(i, 7); v[8] = (*data)(i, 8);`
	`391`	`+ ofield->set_values(v, i);`
	`392`	`+ std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;`
	`393`	`+ */`
	`394`	`+ ofield->set_value(Tensor((data)(i, 0),(data)(i, 1),(data)(i, 2),(data)(i, 3),(data)(i, 4),(data)(i, 8)), i);`
	`395`	`+ std::cout<<"nodes. vector = "<<(data)(i, 0)<<","<<(data)(i, 1)<<","<<(data)(i, 2)<<","<<(data)(i, 3)<<","<<(data)(i, 4)<<","<<(data)(i, 8)<<std::endl;`
`369`	`396`	`}`
`370`	`397`	`for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)`
`371`	`398`	`{`
`372`		`- v[0]=(* data)(0,i); v[1]=(* data)(1,i); v[2]=(* data)(2,i);`
`373`		`- v[3]=(* data)(3,i); v[4]=(* data)(4,i); v[5]=(* data)(5,i);`
`374`		`- v[6]=(* data)(6,i); v[7]=(* data)(7,i); v[8]=(* data)(8,i);`
`375`		`- ofield->set_evalues(v,i);`
`376`		`- }`
	`399`	`+ /*`
	`400`	`+ v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);`
	`401`	`+ v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);`
	`402`	`+ v[6]=(* data)(i,6); v[7]=(* data)(i,7); v[8]=(* data)(i,8);`
	`403`	`+ ofield->set_evalues(v,i);`
	`404`	`+ std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;`
	`405`	`+ */`
	`406`	`+ ofield->set_evalue(Tensor((data)(i, 0),(data)(i, 1),(data)(i, 2),(data)(i, 3),(data)(i, 4),(data)(i, 8)), i);`
	`407`	`+ std::cout<<"elems. vector = "<<(data)(i, 0)<<","<<(data)(i, 1)<<","<<(data)(i, 2)<<","<<(data)(i, 3)<<","<<(data)(i, 4)<<","<<(data)(i, 8)<<std::endl; }`
`377`	`408`	`}`
`378`	`409`	`else if (((nrows == 1) && (ncols == 9)) \|\| ((ncols == 1) && (nrows == 9)))`
`379`	`410`	`{`
	`411`	`+ /*`
`380`	`412`	`Vector v;`
`381`	`413`	`if ((nrows == 1) && (ncols == 9)) { v[0] = (data)(0, 0); v[1] = (data)(0, 1); v[2] = (data)(0, 2); v[3] = (data)(0, 3); v[4] = (data)(0, 4); v[5] = (data)(0, 5); }`
`382`	`414`	`if ((ncols == 1) && (nrows == 9)) { v[0] = (data)(0, 0); v[1] = (data)(1, 0); v[2] = (data)(2, 0); v[3] = (data)(3, 0); v[4] = (data)(4, 0); v[5] = (data)(5, 0); }`
`383`	`415`	`ofield->set_all_values(v);`
	`416`	`+ std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;`
	`417`	`+ */`
	`418`	`+ ofield->set_all_values(Tensor((data)(i, 0),(data)(i, 1),(data)(i, 2),(data)(i, 3),(data)(i, 4),(data)(i, 8)));`
`384`	`419`	`}`
`385`	`420`	`else`
`386`	`421`	`{`