Changeset 4567
- Timestamp:
- 07/13/10 15:55:26 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Tria.cpp
r4562 r4567 1231 1231 double dh1dh3[NDOF2][numgrids]; 1232 1232 1233 /* grid data: */1234 double adjx_list[numgrids];1235 double adjy_list[numgrids];1236 1237 1233 /* gaussian points: */ 1238 1234 int num_gauss,ig; … … 1263 1259 /*nodal functions: */ 1264 1260 double l1l2l3[3]; 1261 double alpha2complement_list[numgrids]; //TO BE DELETED 1262 double gauss[numgrids][numgrids] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED 1265 1263 1266 1264 /* strain rate: */ … … 1292 1290 this->parameters->FindParam(&cm_maxdmp_slope,CmMaxDmpSlopeEnum); 1293 1291 1294 1295 1292 /*Get out if shelf*/ 1296 1293 if(shelf)return; … … 1303 1300 inputs->GetParameterValue(&drag_type,DragTypeEnum); 1304 1301 friction=new Friction("2d",inputs,matpar,analysis_type); 1302 1303 /*COMPUT alpha2_list (TO BE DELETED)*/ 1304 for(i=0;i<numgrids;i++){ 1305 friction->GetAlphaComplement(&alpha2complement_list[i],&gauss[i][0],VxEnum,VyEnum); 1306 } 1305 1307 1306 1308 /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */ … … 1316 1318 1317 1319 /*Build alpha_complement_list: */ 1318 if (drag_type==2) friction->GetAlphaComplement(&alpha_complement, gauss_l1l2l3,VxEnum,VyEnum); 1319 else alpha_complement=0; 1320 //if (drag_type==2) friction->GetAlphaComplement(&alpha_complement, gauss_l1l2l3,VxEnum,VyEnum); // TO BE UNCOMMENTED 1321 //else alpha_complement=0; 1322 GetParameterValue(&alpha_complement,&alpha2complement_list[0],gauss_l1l2l3); // TO BE DELETED 1320 1323 1321 1324 /*Recover alpha_complement and k: */
Note:
See TracChangeset
for help on using the changeset viewer.