Changeset 20515

Timestamp:

04/18/16 10:52:41 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: from Alex Scott, no need to use dynamic allocation for dbasis, static allocation seems to be much faster

Location:

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

Files:

• PentaRef.cpp (modified) (2 diffs)
• SegRef.cpp (modified) (2 diffs)
• TetraRef.cpp (modified) (2 diffs)
• TriaRef.cpp (modified) (2 diffs)

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

@@ -443 +443 @@
 
         /*Get nodal functions derivatives in reference triangle*/
-        IssmDouble* dbasis_ref=xNew<IssmDouble>(3*numnodes);
+        IssmDouble dbasis_ref[3*NUMNODESMAX];
         GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement);
 
@@ -461 +461 @@
                 dbasis[numnodes*2+i]=Jinv[2][0]*dbasis_ref[0*numnodes+i]+Jinv[2][1]*dbasis_ref[1*numnodes+i]+Jinv[2][2]*dbasis_ref[2*numnodes+i];
         }
-
-        /*Clean up*/
-        xDelete<IssmDouble>(dbasis_ref);
 }
 /*}}}*/

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

@@ -146 +146 @@
 
         /*Get nodal functions derivatives in reference triangle*/
-        IssmDouble* dbasis_ref=xNew<IssmDouble>(numnodes);
+        IssmDouble dbasis_ref[1*NUMNODESMAX];
         GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement); 
 
@@ -158 +158 @@
                 dbasis[i] = Jinv*dbasis_ref[i];
         }
-
-        /*Clean up*/
-        xDelete<IssmDouble>(dbasis_ref);
-
 }
 /*}}}*/

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

@@ -225 +225 @@
 
         /*Get nodal functions derivatives in reference triangle*/
-        IssmDouble* dbasis_ref=xNew<IssmDouble>(3*numnodes);
+        IssmDouble dbasis_ref[3*NUMNODESMAX];
         GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement); 
 
@@ -243 +243 @@
                 dbasis[numnodes*2+i]=Jinv[2][0]*dbasis_ref[0*numnodes+i]+Jinv[2][1]*dbasis_ref[1*numnodes+i]+Jinv[2][2]*dbasis_ref[2*numnodes+i];
         }
-
-        /*Clean up*/
-        xDelete<IssmDouble>(dbasis_ref);
 }
 /*}}}*/

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

@@ -197 +197 @@
 
         /*Get nodal functions derivatives in reference triangle*/
-        IssmDouble* dbasis_ref=xNew<IssmDouble>(2*numnodes);
+        IssmDouble dbasis_ref[2*NUMNODESMAX];
         GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement); 
 
@@ -211 +211 @@
                 dbasis[numnodes*1+i] = Jinv[1][0]*dbasis_ref[0*numnodes+i]+Jinv[1][1]*dbasis_ref[1*numnodes+i];
         }
-
-        /*Clean up*/
-        xDelete<IssmDouble>(dbasis_ref);
 
 }