Changeset 9376 for issm/trunk/src/c/objects/Elements/Penta.cpp
- Timestamp:
- 08/23/11 09:17:20 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r9374 r9376 5184 5184 5185 5185 /*Control Inputs*/ 5186 if (control_analysis && iomodel-> f(ControlTypeEnum)){5186 if (control_analysis && iomodel->IsLoaded(ControlTypeEnum)){ 5187 5187 for(i=0;i<num_control_type;i++){ 5188 5188 switch((int)iomodel->f(ControlTypeEnum)[i]){ 5189 5189 case DhdtEnum: 5190 if (iomodel-> f(DhdtEnum)){5190 if (iomodel->IsLoaded(DhdtEnum)){ 5191 5191 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(DhdtEnum)[penta_vertex_ids[j]-1]/yts; 5192 5192 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; … … 5196 5196 break; 5197 5197 case VxEnum: 5198 if (iomodel-> f(VxEnum)){5198 if (iomodel->IsLoaded(VxEnum)){ 5199 5199 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(VxEnum)[penta_vertex_ids[j]-1]/yts; 5200 5200 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; … … 5204 5204 break; 5205 5205 case VyEnum: 5206 if (iomodel-> f(VyEnum)){5206 if (iomodel->IsLoaded(VyEnum)){ 5207 5207 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(VyEnum)[penta_vertex_ids[j]-1]/yts; 5208 5208 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]/yts; … … 5212 5212 break; 5213 5213 case DragCoefficientEnum: 5214 if (iomodel-> f(DragCoefficientEnum)){5214 if (iomodel->IsLoaded(DragCoefficientEnum)){ 5215 5215 for(j=0;j<6;j++)nodeinputs[j]=iomodel->f(DragCoefficientEnum)[penta_vertex_ids[j]-1]; 5216 5216 for(j=0;j<6;j++)cmmininputs[j]=iomodel->f(CmMinEnum)[(penta_vertex_ids[j]-1)*num_control_type+i]; … … 5228 5228 5229 5229 //Need to know the type of approximation for this element 5230 if(iomodel-> f(ElementsTypeEnum)){5230 if(iomodel->IsLoaded(ElementsTypeEnum)){ 5231 5231 if (*(iomodel->f(ElementsTypeEnum)+index)==MacAyealApproximationEnum){ 5232 5232 this->inputs->AddInput(new IntInput(ApproximationEnum,MacAyealApproximationEnum)); … … 5259 5259 5260 5260 /*DatasetInputs*/ 5261 if (iomodel-> f(WeightsEnum)) {5261 if (iomodel->IsLoaded(WeightsEnum)) { 5262 5262 5263 5263 /*Create inputs and add to DataSetInput*/ … … 7569 7569 /*default vx,vy and vz: either observation or 0 */ 7570 7570 if(!iomodel->f(VxEnum)){ 7571 if (iomodel-> f(VxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VxObsEnum)[penta_vertex_ids[i]-1]/yts;7571 if (iomodel->IsLoaded(VxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VxObsEnum)[penta_vertex_ids[i]-1]/yts; 7572 7572 else for(i=0;i<6;i++)nodeinputs[i]=0; 7573 7573 this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); … … 7576 7576 } 7577 7577 if(!iomodel->f(VyEnum)){ 7578 if (iomodel-> f(VyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VyObsEnum)[penta_vertex_ids[i]-1]/yts;7578 if (iomodel->IsLoaded(VyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VyObsEnum)[penta_vertex_ids[i]-1]/yts; 7579 7579 else for(i=0;i<6;i++)nodeinputs[i]=0; 7580 7580 this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); … … 7583 7583 } 7584 7584 if(!iomodel->f(VzEnum)){ 7585 if (iomodel-> f(VzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VzObsEnum)[penta_vertex_ids[i]-1]/yts;7585 if (iomodel->IsLoaded(VzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->f(VzObsEnum)[penta_vertex_ids[i]-1]/yts; 7586 7586 else for(i=0;i<6;i++)nodeinputs[i]=0; 7587 7587 this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); … … 7602 7602 if(*(iomodel->f(ElementsTypeEnum)+index)==PattynStokesApproximationEnum){ 7603 7603 /*Create VzPattyn and VzStokes Enums*/ 7604 if(iomodel-> f(VzEnum) && iomodel->f(NodeOnStokesEnum)){7604 if(iomodel->IsLoaded(VzEnum) && iomodel->IsLoaded(NodeOnStokesEnum)){ 7605 7605 for(i=0;i<6;i++) nodeinputs[i]=iomodel->f(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->f(NodeOnStokesEnum)[penta_vertex_ids[i]-1]; 7606 7606 this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); … … 7616 7616 if(*(iomodel->f(ElementsTypeEnum)+index)==MacAyealStokesApproximationEnum){ 7617 7617 /*Create VzMacAyeal and VzStokes Enums*/ 7618 if(iomodel-> f(VzEnum) && iomodel->f(NodeOnStokesEnum)){7618 if(iomodel->IsLoaded(VzEnum) && iomodel->IsLoaded(NodeOnStokesEnum)){ 7619 7619 for(i=0;i<6;i++) nodeinputs[i]=iomodel->f(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->f(NodeOnStokesEnum)[penta_vertex_ids[i]-1]; 7620 7620 this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); … … 7644 7644 this->inputs->AddInput(new PentaVertexInput(VyMeshEnum,nodeinputs)); 7645 7645 this->inputs->AddInput(new PentaVertexInput(VzMeshEnum,nodeinputs)); 7646 if (iomodel-> f(TemperatureEnum) && iomodel->f(WaterfractionEnum)) {7646 if (iomodel->IsLoaded(TemperatureEnum) && iomodel->IsLoaded(WaterfractionEnum)) { 7647 7647 for(i=0;i<6;i++){ 7648 7648 if(iomodel->f(TemperatureEnum)[penta_vertex_ids[i]-1] < meltingpoint-beta*iomodel->f(PressureEnum)[penta_vertex_ids[i]-1]){
Note:
See TracChangeset
for help on using the changeset viewer.