Skip to content

Commit 42f02b4

Browse files
jessdtatejessdtate
committed
changed all cases. all should be working properly now.
1 parent 9c75cb0 commit 42f02b4

File tree

1 file changed

+44
-20
lines changed

1 file changed

+44
-20
lines changed

‎src/Core/Algorithms/Legacy/Fields/FieldData/SetFieldData.cc‎

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,11 @@ bool SetFieldDataAlgo::setvectordata(VField* ofield, DenseMatrixHandle data, siz
282282
else if (((nrows == 1) && (ncols == 3)) || ((ncols == 1) && (nrows == 3)))
283283
{
284284
Vector v;
285-
if ((nrows == 1) && (nrows == 3)) { v[0] = (*data)(0, 0); v[1] = (*data)(0, 1); v[2] = (*data)(0, 2); }
286-
if ((ncols == 1) && (ncols == 3)) { v[0] = (*data)(0, 0); v[1] = (*data)(1, 0); v[2] = (*data)(2, 0); }
285+
/*
286+
if ((nrows == 1) && (ncols == 3)) { v[0] = (*data)(0, 0); v[1] = (*data)(0, 1); v[2] = (*data)(0, 2); }
287+
if ((ncols == 1) && (nrows == 3)) { v[0] = (*data)(0, 0); v[1] = (*data)(1, 0); v[2] = (*data)(2, 0); }
288+
*/
289+
v[0] = (*data)(0, 0); v[1] = (*data)(0, 1); v[2] = (*data)(0, 2);
287290
ofield->set_all_values(v);
288291
}
289292
else
@@ -304,55 +307,75 @@ bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, siz
304307
if ((ncols == 6) && (nrows == numvals))
305308
{
306309
std::cout<<"rows, 6 elems"<<std::endl;
307-
Vector v[6];
310+
//Vector v[6];
308311
for (VMesh::index_type i = 0; i < numnvals; i++)
309312
{
313+
/*
310314
v[0] = (*data)(i, 0); v[1] = (*data)(i, 1); v[2] = (*data)(i, 2);
311315
v[3] = (*data)(i, 3); v[4] = (*data)(i, 4); v[5] = (*data)(i, 5);
312316
ofield->set_values(v, i);
313317
std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
318+
*/
319+
ofield->set_value(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 5)), i);
320+
std::cout<<"nodes. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 5)<<std::endl;
314321
}
315322
for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
316323
{
324+
/*
317325
v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);
318326
v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);
319327
ofield->set_evalues(v,i);
320328
std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
329+
*/
330+
ofield->set_evalue(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 5)), i);
331+
std::cout<<"elem. vector = "<<(*data)(i, 0)<<","<<(*data)(i, 1)<<","<<(*data)(i, 2)<<","<<(*data)(i, 3)<<","<<(*data)(i, 4)<<","<<(*data)(i, 5)<<std::endl;
321332
}
322333
}
323334
else if ((nrows == 6) && (ncols == numvals))
324335
{
325336
std::cout<<"cols, 6 elems"<<std::endl;
326337

327-
Vector v[6];
338+
//Vector v[6];
328339
for (VMesh::index_type i = 0; i < numnvals; i++)
329340
{
330-
v[0] = (*data)(0, i); v[1] = (*data)(1, i); v[2] = (*data)(2, i);
331-
v[3] = (*data)(3, i); v[4] = (*data)(4, i); v[5] = (*data)(5, i);
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;
341+
/*
342+
v[0] = (*data)(i, 0); v[1] = (*data)(i, 1); v[2] = (*data)(i, 2);
343+
v[3] = (*data)(i, 3); v[4] = (*data)(i, 4); v[5] = (*data)(i, 5);
344+
ofield->set_values(v, i);
345+
std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
346+
*/
347+
ofield->set_value(Tensor((*data)(0,i),(*data)(1,i),(*data)(2,i),(*data)(3,i),(*data)(4,i),(*data)(5,i)), i);
348+
std::cout<<"nodes. vector = "<<(*data)(0,i)<<","<<(*data)(1,i)<<","<<(*data)(2,i)<<","<<(*data)(3,i)<<","<<(*data)(4,i)<<","<<(*data)(5,i)<<std::endl;
334349
}
335350
for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
336351
{
337-
v[0]=(* data)(0,i); v[1]=(* data)(1,i); v[2]=(* data)(2,i);
338-
v[3]=(* data)(3,i); v[4]=(* data)(4,i); v[5]=(* data)(5,i);
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;
352+
/*
353+
v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);
354+
v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);
355+
ofield->set_evalues(v,i);
356+
std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
357+
*/
358+
ofield->set_evalue(Tensor((*data)(0,i),(*data)(1,i),(*data)(2,i),(*data)(3,i),(*data)(4,i),(*data)(5,i)), i);
359+
std::cout<<"elem. vector = "<<(*data)(0,i)<<","<<(*data)(1,i)<<","<<(*data)(2,i)<<","<<(*data)(3,i)<<","<<(*data)(4,i)<<","<<(*data)(5,i)<<std::endl;
341360
}
342361
}
343362
else if (((nrows == 1) && (ncols == 6)) || ((ncols == 1) && (nrows == 6)))
344363
{
364+
/*
345365
Vector v;
346366
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); }
347367
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); }
348368
std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
349-
ofield->set_all_values(v);
369+
*/
370+
371+
ofield->set_all_values(Tensor((*data)(0, 0),(*data)(0, 1),(*data)(0, 2),(*data)(0, 3),(*data)(0, 4),(*data)(0, 5)));
372+
350373
}
351374
/// Handle 9 by n data
352375
else if ((ncols == 9) && (nrows == numvals))
353376
{
354377
std::cout<<"rows, 9 elems"<<std::endl;
355-
Vector v[9];
378+
//Vector v[9];
356379
for (VMesh::index_type i = 0; i < numnvals; i++)
357380
{
358381
/*
@@ -381,7 +404,7 @@ bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, siz
381404
else if ((nrows == 9) && (ncols == numvals))
382405
{
383406
std::cout<<"cols, 9 elems"<<std::endl;
384-
Vector v[9];
407+
//Vector v[9];
385408
for (VMesh::index_type i = 0; i < numnvals; i++)
386409
{
387410
/*
@@ -391,8 +414,8 @@ bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, siz
391414
ofield->set_values(v, i);
392415
std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
393416
*/
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;
417+
ofield->set_value(Tensor((*data)(0,i),(*data)(1,i),(*data)(2,i),(*data)(3,i),(*data)(4,i),(*data)(8,i)), i);
418+
std::cout<<"nodes. vector = "<<(*data)(0,i)<<","<<(*data)(1,i)<<","<<(*data)(2,i)<<","<<(*data)(3,i)<<","<<(*data)(4,i)<<","<<(*data)(8,i)<<std::endl;
396419
}
397420
for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
398421
{
@@ -403,8 +426,9 @@ bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, siz
403426
ofield->set_evalues(v,i);
404427
std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
405428
*/
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; }
429+
ofield->set_evalue(Tensor((*data)(0,i),(*data)(1,i),(*data)(2,i),(*data)(3,i),(*data)(4,i),(*data)(8,i)), i);
430+
std::cout<<"elem. vector = "<<(*data)(0,i)<<","<<(*data)(1,i)<<","<<(*data)(2,i)<<","<<(*data)(3,i)<<","<<(*data)(4,i)<<","<<(*data)(8,i)<<std::endl;
431+
}
408432
}
409433
else if (((nrows == 1) && (ncols == 9)) || ((ncols == 1) && (nrows == 9)))
410434
{
@@ -415,7 +439,7 @@ bool SetFieldDataAlgo::settensordata(VField* ofield, DenseMatrixHandle data, siz
415439
ofield->set_all_values(v);
416440
std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
417441
*/
418-
ofield->set_all_values(Tensor((*data)(i, 0),(*data)(i, 1),(*data)(i, 2),(*data)(i, 3),(*data)(i, 4),(*data)(i, 8)));
442+
ofield->set_all_values(Tensor((*data)(0, 0),(*data)(0, 1),(*data)(0, 2),(*data)(0, 3),(*data)(0, 4),(*data)(0, 8)));
419443
}
420444
else
421445
{

0 commit comments

Comments
 (0)