Changeset 5808 for issm/trunk/src/c/objects/Gauss/GaussPenta.cpp

Timestamp:

09/14/10 16:08:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

New Icefront MUCH cleaner. Enjoy

File:

• issm/trunk/src/c/objects/Gauss/GaussPenta.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Gauss/GaussPenta.cpp

@@ -179 +179 @@
 
         /*Quads: get the gauss points using the product of two line rules  */
-        if(index1==0 && index2==1 && index3==3 && index4==4){
+        if(index1==0 && index2==1 && index3==4 && index4==3){
                 for(i=0;i<order_horiz;i++){
                         for(j=0;j<order_vert;j++){
-                                coords1[i*order_horiz+j]=  0.5*(1-seg_horiz_coords[i]);
-                                coords2[i*order_horiz+j]=1-0.5*(1-seg_horiz_coords[i]);
-                                coords3[i*order_horiz+j]=0.0;
-                                coords4[i*order_horiz+j]=seg_vert_coords[j];
-                                weights[i*order_horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];
+                                coords1[i*order_vert+j]=  0.5*(1-seg_horiz_coords[i]);
+                                coords2[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]);
+                                coords3[i*order_vert+j]=0.0;
+                                coords4[i*order_vert+j]=seg_vert_coords[j];
+                                weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j];
                         }
                 }
         }
-        else if(index1==1 && index2==2 && index3==4 && index4==5){
+        else if(index1==1 && index2==2 && index3==5 && index4==4){
                 for(i=0;i<order_horiz;i++){
                         for(j=0;j<order_vert;j++){
-                                coords1[i*order_horiz+j]=0.0;
-                                coords2[i*order_horiz+j]=  0.5*(1-seg_horiz_coords[i]);
-                                coords3[i*order_horiz+j]=1-0.5*(1-seg_horiz_coords[i]);
-                                coords4[i*order_horiz+j]=seg_vert_coords[j];
-                                weights[i*order_horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];
+                                coords1[i*order_vert+j]=0.0;
+                                coords2[i*order_vert+j]=  0.5*(1-seg_horiz_coords[i]);
+                                coords3[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]);
+                                coords4[i*order_vert+j]=seg_vert_coords[j];
+                                weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j];
                         }
                 }
         }
-        else if(index1==2 && index2==0 && index3==5 && index4==3){
+        else if(index1==2 && index2==0 && index3==3 && index4==5){
                 for(i=0;i<order_horiz;i++){
                         for(j=0;j<order_vert;j++){
-                                coords1[i*order_horiz+j]=1-0.5*(1-seg_horiz_coords[i]);
-                                coords2[i*order_horiz+j]=0.0;
-                                coords3[i*order_horiz+j]=  0.5*(1-seg_horiz_coords[i]);
-                                coords4[i*order_horiz+j]=seg_vert_coords[j];
-                                weights[i*order_horiz+j]=seg_horiz_weights[i]*seg_vert_weights[j];
+                                coords1[i*order_vert+j]=1-0.5*(1-seg_horiz_coords[i]);
+                                coords2[i*order_vert+j]=0.0;
+                                coords3[i*order_vert+j]=  0.5*(1-seg_horiz_coords[i]);
+                                coords4[i*order_vert+j]=seg_vert_coords[j];
+                                weights[i*order_vert+j]=seg_horiz_weights[i]*seg_vert_weights[j];
                         }
                 }
@@ -216 +216 @@
         }
 
+        /*clean-up*/
+        xfree((void**)&seg_horiz_coords);
+        xfree((void**)&seg_horiz_weights);
+        xfree((void**)&seg_vert_coords);
+        xfree((void**)&seg_vert_weights);
 }
 /*}}}*/