Changeset 25728

Timestamp:

10/31/20 16:37:05 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to get rid of as many xNew as possible

File:

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

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

@@ -255 +255 @@
         /*Allocate arrays*/
         const int NUM_VERTICES = this->GetNumberOfVertices();
-
-        IssmDouble* eps_xx = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_yy = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_zz = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_xy = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_xz = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_yz = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* eps_ef = xNew<IssmDouble>(NUM_VERTICES);
+        _assert_(NUM_VERTICES<=MAXVERTICES);
+
+        IssmDouble eps_xx[MAXVERTICES];
+        IssmDouble eps_yy[MAXVERTICES];
+        IssmDouble eps_zz[MAXVERTICES];
+        IssmDouble eps_xy[MAXVERTICES];
+        IssmDouble eps_xz[MAXVERTICES];
+        IssmDouble eps_yz[MAXVERTICES];
+        IssmDouble eps_ef[MAXVERTICES];
 
         /* Start looping on the number of vertices: */
@@ -297 +298 @@
 
         /*Add Stress tensor components into inputs*/
-        this->AddInput(StrainRatexxEnum,eps_xx,P1Enum);
-        this->AddInput(StrainRatexyEnum,eps_xy,P1Enum);
-        this->AddInput(StrainRatexzEnum,eps_xz,P1Enum);
-        this->AddInput(StrainRateyyEnum,eps_yy,P1Enum);
-        this->AddInput(StrainRateyzEnum,eps_yz,P1Enum);
-        this->AddInput(StrainRatezzEnum,eps_zz,P1Enum);
-        this->AddInput(StrainRateeffectiveEnum,eps_ef,P1Enum);
+        this->AddInput(StrainRatexxEnum,&eps_xx[0],P1Enum);
+        this->AddInput(StrainRatexyEnum,&eps_xy[0],P1Enum);
+        this->AddInput(StrainRatexzEnum,&eps_xz[0],P1Enum);
+        this->AddInput(StrainRateyyEnum,&eps_yy[0],P1Enum);
+        this->AddInput(StrainRateyzEnum,&eps_yz[0],P1Enum);
+        this->AddInput(StrainRatezzEnum,&eps_zz[0],P1Enum);
+        this->AddInput(StrainRateeffectiveEnum,&eps_ef[0],P1Enum);
 
         /*Clean up and return*/
         delete gauss;
         xDelete<IssmDouble>(xyz_list);
-        xDelete<IssmDouble>(eps_xx);
-        xDelete<IssmDouble>(eps_yy);
-        xDelete<IssmDouble>(eps_zz);
-        xDelete<IssmDouble>(eps_xy);
-        xDelete<IssmDouble>(eps_xz);
-        xDelete<IssmDouble>(eps_yz);
-        xDelete<IssmDouble>(eps_ef);
-
 }
 /*}}}*/