Changeset 26691

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: avoid dynamic allocation if not needed

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (2 diffs)

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

@@ -2194 +2194 @@
                 int         point;
                 IssmDouble  f1,f2,phi;
-                IssmDouble* heights = xNew<IssmDouble>(NUMVERTICES2D);
+                IssmDouble  heights[NUMVERTICES2D];
                 IssmDouble  weights[NUMVERTICES2D];
                 IssmDouble  lsf2d[NUMVERTICES2D];
@@ -2219 +2219 @@
                         xDelete<IssmDouble>(scalefactor_vertices);
                 }
-                xDelete<IssmDouble>(heights); 
         }
 

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

@@ -3552 +3552 @@
                 bool istrapneg;
       int point;
-      IssmDouble* weights  = xNew<IssmDouble>(NUMVERTICES);
-      IssmDouble* surfaces = xNew<IssmDouble>(NUMVERTICES);
-      IssmDouble* bases    = xNew<IssmDouble>(NUMVERTICES);
-      IssmDouble* Hice     = xNew<IssmDouble>(NUMVERTICES);
+      IssmDouble weights[NUMVERTICES];
+      IssmDouble surfaces[NUMVERTICES];
+      IssmDouble bases[NUMVERTICES];
+      IssmDouble Hice[NUMVERTICES];
       IssmDouble area_basetot,f1,f2,phi;
       /*Average thickness over subelement*/
@@ -3578 +3578 @@
                         xDelete<IssmDouble>(scalefactor_vertices);
                 }
-
-                /*Cleanup*/
-                xDelete<IssmDouble>(weights);
-                xDelete<IssmDouble>(surfaces);
-                xDelete<IssmDouble>(bases);
-                xDelete<IssmDouble>(Hice);
    }
         else{