Changeset 3673 for issm/trunk/src/c/DataSet/DataSet.cpp
- Timestamp:
- 05/08/10 14:37:25 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk/src/c/DataSet/DataSet.cpp ¶
r3649 r3673 207 207 dataset->AddObject(vertex); 208 208 } 209 else if(enum_type==ParamEnum){ 210 Param* param=NULL; 211 param=new Param(); 212 param->Demarshall(&marshalled_dataset); 213 dataset->AddObject(param); 214 } 215 else if(enum_type==NumparEnum){ 216 Numpar* numpar=NULL; 217 numpar=new Numpar(); 218 numpar->Demarshall(&marshalled_dataset); 219 dataset->AddObject(numpar); 209 else if(enum_type==DoubleParamEnum){ 210 DoubleParam* doubleparam=NULL; 211 doubleparam=new DoubleParam(); 212 doubleparam->Demarshall(&marshalled_dataset); 213 dataset->AddObject(doubleparam); 220 214 } 221 215 else if(enum_type==TriaEnum){ … … 512 506 513 507 /*Which id does it have: */ 514 id=(*object)-> GetId();508 id=(*object)->Id(); 515 509 516 510 /*Plug rank into ranks, according to id: */ … … 532 526 for(i=0;i<objects.size();i++){ 533 527 id_offsets[i]=i; 534 sorted_ids[i]=objects[i]-> GetId();528 sorted_ids[i]=objects[i]->Id(); 535 529 } 536 530 } … … 1364 1358 element->UpdateInputs(solution,analysis_type,sub_analysis_type); 1365 1359 } 1366 else ISSMERROR("%s%i%s"," object with id: ",(*object)->GetId()," is not an element, in a function that deals only with elements!"); 1360 else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!"); 1361 } 1362 } 1363 /*}}}*/ 1364 /*FUNCTION DataSet::AddInput{{{1*/ 1365 void DataSet::AddInput(double value, int enum_type){ 1366 1367 vector<Object*>::iterator object; 1368 Element* element=NULL; 1369 1370 for ( object=objects.begin() ; object < objects.end(); object++ ){ 1371 1372 if(EnumIsElement((*object)->Enum())){ 1373 1374 element=(Element*)(*object); 1375 element->AddInput(value,enum_type); 1376 } 1377 else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!"); 1367 1378 } 1368 1379 }
Note:
See TracChangeset
for help on using the changeset viewer.