Changeset 5808 for issm/trunk/src/c/objects/Gauss/GaussPenta.cpp
- Timestamp:
- 09/14/10 16:08:56 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Gauss/GaussPenta.cpp
r5797 r5808 179 179 180 180 /*Quads: get the gauss points using the product of two line rules */ 181 if(index1==0 && index2==1 && index3== 3 && index4==4){181 if(index1==0 && index2==1 && index3==4 && index4==3){ 182 182 for(i=0;i<order_horiz;i++){ 183 183 for(j=0;j<order_vert;j++){ 184 coords1[i*order_ horiz+j]= 0.5*(1-seg_horiz_coords[i]);185 coords2[i*order_ horiz+j]=1-0.5*(1-seg_horiz_coords[i]);186 coords3[i*order_ horiz+j]=0.0;187 coords4[i*order_ horiz+j]=seg_vert_coords[j];188 weights[i*order_ horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];184 coords1[i*order_vert+j]= 0.5*(1-seg_horiz_coords[i]); 185 coords2[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]); 186 coords3[i*order_vert+j]=0.0; 187 coords4[i*order_vert+j]=seg_vert_coords[j]; 188 weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j]; 189 189 } 190 190 } 191 191 } 192 else if(index1==1 && index2==2 && index3== 4 && index4==5){192 else if(index1==1 && index2==2 && index3==5 && index4==4){ 193 193 for(i=0;i<order_horiz;i++){ 194 194 for(j=0;j<order_vert;j++){ 195 coords1[i*order_ horiz+j]=0.0;196 coords2[i*order_ horiz+j]= 0.5*(1-seg_horiz_coords[i]);197 coords3[i*order_ horiz+j]=1-0.5*(1-seg_horiz_coords[i]);198 coords4[i*order_ horiz+j]=seg_vert_coords[j];199 weights[i*order_ horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];195 coords1[i*order_vert+j]=0.0; 196 coords2[i*order_vert+j]= 0.5*(1-seg_horiz_coords[i]); 197 coords3[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]); 198 coords4[i*order_vert+j]=seg_vert_coords[j]; 199 weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j]; 200 200 } 201 201 } 202 202 } 203 else if(index1==2 && index2==0 && index3== 5 && index4==3){203 else if(index1==2 && index2==0 && index3==3 && index4==5){ 204 204 for(i=0;i<order_horiz;i++){ 205 205 for(j=0;j<order_vert;j++){ 206 coords1[i*order_ horiz+j]=1-0.5*(1-seg_horiz_coords[i]);207 coords2[i*order_ horiz+j]=0.0;208 coords3[i*order_ horiz+j]= 0.5*(1-seg_horiz_coords[i]);209 coords4[i*order_ horiz+j]=seg_vert_coords[j];210 weights[i*order_ horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];206 coords1[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]); 207 coords2[i*order_vert+j]=0.0; 208 coords3[i*order_vert+j]= 0.5*(1-seg_horiz_coords[i]); 209 coords4[i*order_vert+j]=seg_vert_coords[j]; 210 weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j]; 211 211 } 212 212 } … … 216 216 } 217 217 218 /*clean-up*/ 219 xfree((void**)&seg_horiz_coords); 220 xfree((void**)&seg_horiz_weights); 221 xfree((void**)&seg_vert_coords); 222 xfree((void**)&seg_vert_weights); 218 223 } 219 224 /*}}}*/
Note:
See TracChangeset
for help on using the changeset viewer.