Changeset 5523
- Timestamp:
- 08/23/10 15:38:15 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r5518 r5523 2206 2206 } 2207 2207 2208 //if diagnostic Full-Stokes: check that the element is Stokes2209 if(analysis_type==DiagnosticStokesAnalysisEnum){2210 ISSMASSERT(iomodel->elements_type);2211 if(iomodel->elements_type[index]==StokesApproximationEnum)2212 this->inputs->AddInput(new BoolInput(IsStokesEnum,true));2213 else2214 this->inputs->AddInput(new BoolInput(IsStokesEnum,false));2215 }2216 2217 2208 } 2218 2209 /*}}}*/ … … 2944 2935 bool onbed; 2945 2936 bool shelf; 2946 bool isstokes;2947 2937 2948 2938 /*inputs: */ … … 2958 2948 inputs->GetParameterValue(&onbed,ElementOnBedEnum); 2959 2949 inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum); 2960 inputs->GetParameterValue(&isstokes,IsStokesEnum);2961 2950 inputs->GetParameterValue(&approximation,ApproximationEnum); 2962 2951 2963 2952 /*If on water or not Stokes, skip stiffness: */ 2964 if(onwater || !isstokes ||approximation!=StokesApproximationEnum) return;2953 if(onwater || approximation!=StokesApproximationEnum) return; 2965 2954 2966 2955 /*recovre material parameters: */ … … 4131 4120 bool onbed; 4132 4121 bool shelf; 4133 bool isstokes;4134 4122 int approximation; 4135 4123 Input* vx_input=NULL; … … 4142 4130 inputs->GetParameterValue(&onbed,ElementOnBedEnum); 4143 4131 inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum); 4144 inputs->GetParameterValue(&isstokes,IsStokesEnum);4145 4132 inputs->GetParameterValue(&approximation,ApproximationEnum); 4146 4133 … … 4149 4136 4150 4137 /*If on water or not Stokes, skip load: */ 4151 if(onwater || !isstokes ||approximation!=StokesApproximationEnum) return;4138 if(onwater || approximation!=StokesApproximationEnum) return; 4152 4139 4153 4140 /*If on water, skip load: */ -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r5426 r5523 697 697 double v35[3]; 698 698 double v45[3]; 699 bool isstokes;699 int approximation; 700 700 701 701 /*Recover hook objects: */ … … 709 709 710 710 /*If not Stokes, return*/ 711 penta->inputs->GetParameterValue(& isstokes,IsStokesEnum);712 if( !isstokes) return;711 penta->inputs->GetParameterValue(&approximation,ApproximationEnum); 712 if(approximation!=StokesApproximationEnum) return; 713 713 714 714 /* Get dof list and node coordinates: */ -
issm/trunk/src/c/objects/Loads/Pengrid.cpp
r5510 r5523 574 574 double Ke[4][4]={0.0}; 575 575 double penalty_offset; 576 bool isstokes;576 int approximation; 577 577 578 578 /*pointers: */ … … 588 588 589 589 /*If not Stokes, return*/ 590 penta->inputs->GetParameterValue(& isstokes,IsStokesEnum);591 if( !isstokes) return;590 penta->inputs->GetParameterValue(&approximation,ApproximationEnum); 591 if(approximation!=StokesApproximationEnum) return; 592 592 593 593 //recover slope: */
Note:
See TracChangeset
for help on using the changeset viewer.