Changeset 4118
- Timestamp:
- 06/22/10 13:54:09 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp ¶
r4034 r4118 39 39 node=(Node*)nodes->GetObjectByOffset(i); 40 40 if(node->InAnalysis(analysis_type)){ 41 41 node->Configure(nodes,vertices); 42 42 } 43 43 } -
TabularUnified issm/trunk/src/c/objects/Elements/Tria.cpp ¶
r4091 r4118 320 320 /*}}}*/ 321 321 /*FUNCTION Tria::DeepEcho{{{1*/ 322 323 322 void Tria::DeepEcho(void){ 324 323 … … 353 352 /*}}}*/ 354 353 /*FUNCTION Tria::Echo{{{1*/ 355 356 354 void Tria::Echo(void){ 357 this->DeepEcho(); 355 printf("Tria:\n"); 356 printf(" id: %i\n",id); 357 if(nodes){ 358 nodes[0]->Echo(); 359 nodes[1]->Echo(); 360 nodes[2]->Echo(); 361 } 362 else printf("nodes = NULL\n"); 363 364 if (matice) matice->Echo(); 365 else printf("matice = NULL\n"); 366 367 if (matpar) matpar->Echo(); 368 else printf("matpar = NULL\n"); 369 370 printf(" parameters\n"); 371 if (parameters) parameters->Echo(); 372 else printf("parameters = NULL\n"); 373 374 printf(" inputs\n"); 375 if (inputs) inputs->Echo(); 376 else printf("inputs=NULL\n"); 377 378 if (results) results->Echo(); 379 else printf("results=NULL\n"); 358 380 } 359 381 /*}}}*/ … … 729 751 void Tria::GetSolutionFromInputs(Vec solution){ 730 752 731 int analysis_type ,sub_analysis_type;753 int analysis_type; 732 754 733 755 /*retrive parameters: */ 734 756 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 735 parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);736 757 737 758 /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ 738 if (analysis_type==DiagnosticAnalysisEnum){ 739 if (sub_analysis_type==HorizAnalysisEnum){ 740 GetSolutionFromInputsDiagnosticHoriz(solution); 741 } 742 else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet"); 743 } 744 else{ 745 ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet"); 746 } 759 if (analysis_type==DiagnosticHorizAnalysisEnum) 760 GetSolutionFromInputsDiagnosticHoriz(solution); 761 else 762 ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet"); 763 747 764 } 748 765 /*}}}*/ … … 3796 3813 int numberofdofspernode; 3797 3814 3815 /*Some checks for debugging*/ 3816 ISSMASSERT(doflist); 3817 ISSMASSERT(pnumberofdofspernode); 3818 ISSMASSERT(nodes); 3819 3820 /*Build doflist from nodes*/ 3798 3821 for(i=0;i<3;i++){ 3799 3822 nodes[i]->GetDofList(&doflist_per_node[0],&numberofdofspernode); -
TabularUnified issm/trunk/src/c/objects/Node.cpp ¶
r4117 r4118 247 247 hupper_node.Echo(); 248 248 printf(" inputs\n"); 249 inputs-> DeepEcho();249 inputs->Echo(); 250 250 251 251 … … 371 371 /*FUNCTION Node::InAnalysis(int analysis_type){{{2*/ 372 372 bool Node::InAnalysis(int in_analysis_type){ 373 if (in_analysis_type= this->analysis_type)return true;373 if (in_analysis_type==this->analysis_type) return true; 374 374 else return false; 375 375 }
Note:
See TracChangeset
for help on using the changeset viewer.