Changeset 26692

Timestamp:

12/02/21 06:49:14 (3 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing problem with indexing of weights

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1247 +1247 @@
 
    /*Weights*/
-   Gauss* gauss = NULL;
    IssmDouble loadweights_g[NUMVERTICES2D];
    IssmDouble total_weight = 0;
@@ -1292 +1291 @@
                 else _error_("case not possible");
         }
-        if(trapezeisnegative) phi = 1-f1*f2;
+        if(trapezeisnegative) phi = 1.-f1*f2;
         else                  phi = f1*f2;
         
         /*Compute weights*/
-        gauss = this->NewGauss(point,f1,f2,1-trapezeisnegative,2);
+        Gauss* gauss = this->NewGauss(point,f1,f2,1-trapezeisnegative,2);
 
         total_weight = 0.0;
@@ -1305 +1304 @@
                 total_weight += gauss->weight;
         }
+        delete gauss;
 
         /*Normalizing to phi such that weights provide coefficients for integration over subelement (for averaging:phi*weights)*/
-   if(total_weight>0.) for(int i=0;i<NUMVERTICES;i++) weights[i] = weights[i]*phi/total_weight;
+   if(total_weight>0.) for(int i=0;i<NUMVERTICES2D;i++) weights[i] = weights[i]*phi/total_weight;
         else for(int i=0;i<NUMVERTICES2D;i++) weights[i] = 0.0;
-
-        /*Cleanup*/
-        delete gauss;
         
         /*Assign output pointers*/
@@ -2201 +2198 @@
                         lsf2d[i]   = lsf[i];
                 }
-                GetFractionGeometry2D(weights,&phi,&point,&f1,&f2,&istrapneg,lsf2d);
+                GetFractionGeometry2D(&weights[0],&phi,&point,&f1,&f2,&istrapneg,lsf2d);
                 
                 IssmDouble basetot;