Changeset 15787

Timestamp:

08/10/13 07:22:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: don't delete doflist

File:

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

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

@@ -1014 +1014 @@
 
         /*Assign output pointers:*/
-        xDelete<int>(doflist);
         *pdoflist=doflist;
 }
@@ -2974 +2973 @@
 void  Penta::ResetCoordinateSystem(void){
 
-        int    approximation;
-        IssmDouble slopex[NUMVERTICES];
-        IssmDouble slopey[NUMVERTICES];
+        int        approximation;
         IssmDouble xz_plane[6];
 
@@ -2983 +2980 @@
         if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum &&  approximation!=HOFSApproximationEnum)) return;
 
+        /*Get number of nodes for velocity only and base*/
+        int         numnodes = this->NumberofNodesVelocity();
+        IssmDouble* slopex   = xNew<IssmDouble>(numnodes);
+        IssmDouble* slopey   = xNew<IssmDouble>(numnodes);
+
         /*Get slope on each node*/
-        GetInputListOnVertices(&slopex[0],BedSlopeXEnum);
-        GetInputListOnVertices(&slopey[0],BedSlopeYEnum);
-
-        /*Loop over basal nodes (first 3) and update their CS*/
-        for(int i=0;i<NUMVERTICES2D;i++){
+        GetInputListOnNodes(slopex,BedSlopeXEnum);
+        GetInputListOnNodes(slopey,BedSlopeYEnum);
+
+        /*Loop over basal nodes and update their CS*/
+        for(int i=0;i<3;i++){//FIXME
 
                 /*New X axis             New Z axis*/
@@ -2997 +2999 @@
                 XZvectorsToCoordinateSystem(&this->nodes[i]->coord_system[0][0],&xz_plane[0]);
         }
+
+        /*cleanup*/
+        xDelete<IssmDouble>(slopex);
+        xDelete<IssmDouble>(slopey);
 }
 /*}}}*/
@@ -10048 +10054 @@
         xDelete<int>(doflistm);
         xDelete<int>(doflists);
+        xDelete<int>(doflistpressure);
 }
 /*}}}*/