@@ -282,10 +282,6 @@ bool SetFieldDataAlgo::setvectordata(VField* ofield, DenseMatrixHandle data, siz
282282 else if (((nrows == 1 ) && (ncols == 3 )) || ((ncols == 1 ) && (nrows == 3 )))
283283 {
284284 Vector v;
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- */
289285 v[0 ] = (*data)(0 , 0 ); v[1 ] = (*data)(0 , 1 ); v[2 ] = (*data)(0 , 2 );
290286 ofield->set_all_values (v);
291287 }
@@ -300,145 +296,61 @@ bool SetFieldDataAlgo::setvectordata(VField* ofield, DenseMatrixHandle data, siz
300296
301297bool SetFieldDataAlgo::settensordata (VField* ofield, DenseMatrixHandle data, size_type numvals, size_type nrows, size_type ncols, size_type numnvals, size_type numevals) const
302298{
303-
304- std::cout<<" settensordata" <<std::endl;
305299 // / Fill field with Tensor values
306300 // / Handle 6 by n data
307301 if ((ncols == 6 ) && (nrows == numvals))
308302 {
309- std::cout<<" rows, 6 elems" <<std::endl;
310- // Vector v[6];
311303 for (VMesh::index_type i = 0 ; i < numnvals; i++)
312304 {
313- /*
314- v[0] = (*data)(i, 0); v[1] = (*data)(i, 1); v[2] = (*data)(i, 2);
315- v[3] = (*data)(i, 3); v[4] = (*data)(i, 4); v[5] = (*data)(i, 5);
316- ofield->set_values(v, i);
317- std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
318- */
319305 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;
321306 }
322307 for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
323308 {
324- /*
325- v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);
326- v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);
327- ofield->set_evalues(v,i);
328- std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
329- */
330309 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;
332310 }
333311 }
334312 else if ((nrows == 6 ) && (ncols == numvals))
335313 {
336- std::cout<<" cols, 6 elems" <<std::endl;
337-
338- // Vector v[6];
339314 for (VMesh::index_type i = 0 ; i < numnvals; i++)
340315 {
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- */
347316 ofield->set_value (Tensor ((*data)(0 ,i),(*data)(1 ,i),(*data)(2 ,i),(*data)(3 ,i),(*data)(4 ,i),(*data)(5 ,i)), i);
348317 std::cout<<" nodes. vector = " <<(*data)(0 ,i)<<" ," <<(*data)(1 ,i)<<" ," <<(*data)(2 ,i)<<" ," <<(*data)(3 ,i)<<" ," <<(*data)(4 ,i)<<" ," <<(*data)(5 ,i)<<std::endl;
349318 }
350319 for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
351320 {
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- */
358321 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;
360322 }
361323 }
362324 else if (((nrows == 1 ) && (ncols == 6 )) || ((ncols == 1 ) && (nrows == 6 )))
363325 {
364- /*
365- Vector v;
366- 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); }
367- 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); }
368- std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<std::endl;
369- */
370-
371326 ofield->set_all_values (Tensor ((*data)(0 , 0 ),(*data)(0 , 1 ),(*data)(0 , 2 ),(*data)(0 , 3 ),(*data)(0 , 4 ),(*data)(0 , 5 )));
372327
373328 }
374329 // / Handle 9 by n data
375330 else if ((ncols == 9 ) && (nrows == numvals))
376331 {
377- std::cout<<" rows, 9 elems" <<std::endl;
378- // Vector v[9];
379332 for (VMesh::index_type i = 0 ; i < numnvals; i++)
380333 {
381- /*
382- v[0] = (*data)(i, 0); v[1] = (*data)(i, 1); v[2] = (*data)(i, 2);
383- v[3] = (*data)(i, 3); v[4] = (*data)(i, 4); v[5] = (*data)(i, 5);
384- v[6] = (*data)(i, 6); v[7] = (*data)(i, 7); v[8] = (*data)(i, 8);
385- ofield->set_values(v, i);
386- std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
387- */
388334 ofield->set_value (Tensor ((*data)(i, 0 ),(*data)(i, 1 ),(*data)(i, 2 ),(*data)(i, 3 ),(*data)(i, 4 ),(*data)(i, 8 )), i);
389- std::cout<<" nodes. vector = " <<(*data)(i, 0 )<<" ," <<(*data)(i, 1 )<<" ," <<(*data)(i, 2 )<<" ," <<(*data)(i, 3 )<<" ," <<(*data)(i, 4 )<<" ," <<(*data)(i, 8 )<<std::endl;
390335 }
391336 for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
392337 {
393- /*
394- v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);
395- v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);
396- v[6]=(* data)(i,6); v[7]=(* data)(i,7); v[8]=(* data)(i,8);
397- ofield->set_evalues(v,i);
398- std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
399- */
400338 ofield->set_evalue (Tensor ((*data)(i, 0 ),(*data)(i, 1 ),(*data)(i, 2 ),(*data)(i, 3 ),(*data)(i, 4 ),(*data)(i, 8 )), i);
401- std::cout<<" elems. vector = " <<(*data)(i, 0 )<<" ," <<(*data)(i, 1 )<<" ," <<(*data)(i, 2 )<<" ," <<(*data)(i, 3 )<<" ," <<(*data)(i, 4 )<<" ," <<(*data)(i, 8 )<<std::endl;
402339 }
403340 }
404341 else if ((nrows == 9 ) && (ncols == numvals))
405342 {
406- std::cout<<" cols, 9 elems" <<std::endl;
407- // Vector v[9];
408343 for (VMesh::index_type i = 0 ; i < numnvals; i++)
409344 {
410- /*
411- v[0] = (*data)(i, 0); v[1] = (*data)(i, 1); v[2] = (*data)(i, 2);
412- v[3] = (*data)(i, 3); v[4] = (*data)(i, 4); v[5] = (*data)(i, 5);
413- v[6] = (*data)(i, 6); v[7] = (*data)(i, 7); v[8] = (*data)(i, 8);
414- ofield->set_values(v, i);
415- std::cout<<"nodes. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
416- */
417345 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;
419346 }
420347 for (VMesh::index_type i=numnvals; i< numevals+numnvals; i++)
421348 {
422- /*
423- v[0]=(* data)(i,0); v[1]=(* data)(i,1); v[2]=(* data)(i,2);
424- v[3]=(* data)(i,3); v[4]=(* data)(i,4); v[5]=(* data)(i,5);
425- v[6]=(* data)(i,6); v[7]=(* data)(i,7); v[8]=(* data)(i,8);
426- ofield->set_evalues(v,i);
427- std::cout<<"elems. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
428- */
429349 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;
431350 }
432351 }
433352 else if (((nrows == 1 ) && (ncols == 9 )) || ((ncols == 1 ) && (nrows == 9 )))
434353 {
435- /*
436- Vector v;
437- 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); }
438- 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); }
439- ofield->set_all_values(v);
440- std::cout<<"constant. vector = "<<v[0]<<','<<v[1]<<','<<v[2]<<','<<v[3]<<','<<v[4]<<','<<v[5]<<','<<v[6]<<','<<v[7]<<','<<v[8]<<std::endl;
441- */
442354 ofield->set_all_values (Tensor ((*data)(0 , 0 ),(*data)(0 , 1 ),(*data)(0 , 2 ),(*data)(0 , 3 ),(*data)(0 , 4 ),(*data)(0 , 8 )));
443355 }
444356 else
0 commit comments