Changeset 26694

Timestamp:

12/02/21 06:56:02 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: final bug

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*/
-   IssmDouble loadweights_g[NUMVERTICES2D];
+   IssmDouble loadweights_g[NUMVERTICES];
    IssmDouble total_weight = 0;
 
@@ -2181 +2181 @@
         IssmDouble lsf[NUMVERTICES];
 
-        if(!IsIceInElement())return 0;
+        if(!IsIceInElement()) return 0;
 
         ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
@@ -2208 +2208 @@
                 /*Account for scaling factor averaged over subelement 2D area*/
                 if(scaled==true){
-                        IssmDouble* scalefactor_vertices   = xNew<IssmDouble>(NUMVERTICES);
+                        IssmDouble scalefactor_vertices[NUMVERTICES];
                         Element::GetInputListOnVertices(&scalefactor_vertices[0],MeshScaleFactorEnum);
                         /*Compute loop only over lower vertices: i<NUMVERTICES2D*/
@@ -2214 +2214 @@
                         for(int i=0;i<NUMVERTICES2D;i++) scalefactor += weights[i]/phi*scalefactor_vertices[i];
                         base = base*scalefactor;
-                        xDelete<IssmDouble>(scalefactor_vertices);
                 }
         }