Changeset 9405 for issm/trunk/src/c/objects/Materials/Matice.cpp
- Timestamp:
- 08/24/11 12:10:50 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Materials/Matice.cpp
r9380 r9405 660 660 661 661 /*Fetch parameters: */ 662 iomodel-> constants->FindParam(&dim,DimEnum);663 iomodel-> constants->FindParam(&control_analysis,ControlAnalysisEnum);664 iomodel-> constants->FindParam(&num_control_type,NumControlTypeEnum);662 iomodel->Constant(&dim,DimEnum); 663 iomodel->Constant(&control_analysis,ControlAnalysisEnum); 664 iomodel->Constant(&num_control_type,NumControlTypeEnum); 665 665 666 666 /*if 2d*/ … … 674 674 675 675 /*Get B*/ 676 if (iomodel-> f(RheologyBEnum)) {677 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel-> f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+i]-1)];676 if (iomodel->Data(RheologyBEnum)) { 677 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+i]-1)]; 678 678 this->inputs->AddInput(new TriaVertexInput(RheologyBbarEnum,nodeinputs)); 679 679 } 680 680 681 681 /*Get n*/ 682 if (iomodel-> f(RheologyNEnum)) {683 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel-> f(RheologyNEnum)[index];682 if (iomodel->Data(RheologyNEnum)) { 683 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyNEnum)[index]; 684 684 this->inputs->AddInput(new TriaVertexInput(RheologyNEnum,nodeinputs)); 685 685 } 686 686 687 687 /*Control Inputs*/ 688 if (control_analysis && iomodel-> f(ControlTypeEnum)){688 if (control_analysis && iomodel->Data(ControlTypeEnum)){ 689 689 for(i=0;i<num_control_type;i++){ 690 switch((int)iomodel-> f(ControlTypeEnum)[i]){690 switch((int)iomodel->Data(ControlTypeEnum)[i]){ 691 691 case RheologyBbarEnum: 692 if (iomodel-> f(RheologyBEnum)){693 _assert_(iomodel-> f(RheologyBEnum));_assert_(iomodel->f(CmMinEnum)); _assert_(iomodel->f(CmMaxEnum));694 for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel-> f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)];695 for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel-> f(CmMinEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];696 for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel-> f(CmMaxEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];692 if (iomodel->Data(RheologyBEnum)){ 693 _assert_(iomodel->Data(RheologyBEnum));_assert_(iomodel->Data(CmMinEnum)); _assert_(iomodel->Data(CmMaxEnum)); 694 for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)]; 695 for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(CmMinEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; 696 for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(CmMaxEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; 697 697 this->inputs->AddInput(new ControlInput(RheologyBbarEnum,TriaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); 698 698 } … … 713 713 714 714 /*Get B*/ 715 if (iomodel-> f(RheologyBEnum)) {716 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel-> f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+i]-1)];715 if (iomodel->Data(RheologyBEnum)) { 716 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+i]-1)]; 717 717 this->inputs->AddInput(new PentaVertexInput(RheologyBEnum,nodeinputs)); 718 718 } 719 719 720 720 /*Get n*/ 721 if (iomodel-> f(RheologyNEnum)) {722 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel-> f(RheologyNEnum)[index];721 if (iomodel->Data(RheologyNEnum)) { 722 for(i=0;i<num_vertices;i++) nodeinputs[i]=iomodel->Data(RheologyNEnum)[index]; 723 723 this->inputs->AddInput(new PentaVertexInput(RheologyNEnum,nodeinputs)); 724 724 } 725 725 726 726 /*Control Inputs*/ 727 if (control_analysis && iomodel-> f(ControlTypeEnum)){727 if (control_analysis && iomodel->Data(ControlTypeEnum)){ 728 728 for(i=0;i<num_control_type;i++){ 729 switch((int)iomodel-> f(ControlTypeEnum)[i]){729 switch((int)iomodel->Data(ControlTypeEnum)[i]){ 730 730 case RheologyBbarEnum: 731 if (iomodel-> f(RheologyBEnum)){732 _assert_(iomodel-> f(RheologyBEnum));_assert_(iomodel->f(CmMinEnum)); _assert_(iomodel->f(CmMaxEnum));733 for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel-> f(RheologyBEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)];734 for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel-> f(CmMinEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];735 for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel-> f(CmMaxEnum)[int(iomodel->f(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i];731 if (iomodel->Data(RheologyBEnum)){ 732 _assert_(iomodel->Data(RheologyBEnum));_assert_(iomodel->Data(CmMinEnum)); _assert_(iomodel->Data(CmMaxEnum)); 733 for(j=0;j<num_vertices;j++)nodeinputs[j]=iomodel->Data(RheologyBEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)]; 734 for(j=0;j<num_vertices;j++)cmmininputs[j]=iomodel->Data(CmMinEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; 735 for(j=0;j<num_vertices;j++)cmmaxinputs[j]=iomodel->Data(CmMaxEnum)[int(iomodel->Data(ElementsEnum)[num_vertices*index+j]-1)*num_control_type+i]; 736 736 this->inputs->AddInput(new ControlInput(RheologyBEnum,PentaVertexInputEnum,nodeinputs,cmmininputs,cmmaxinputs,i+1)); 737 737 }
Note:
See TracChangeset
for help on using the changeset viewer.