Changeset 4925

Timestamp:

08/02/10 13:05:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

Delete Added inputs after spawning Tria

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (7 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1969 +1969 @@
         tria->CreateKMatrix(Kgg);
         delete tria;
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
         return;
 
@@ -2002 +2007 @@
         tria->CreateKMatrix(Kgg);
         delete tria;
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
         return;
 
@@ -2780 +2790 @@
         tria->CreateKMatrix(Kgg);
         delete tria;
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
         return;
 
@@ -3078 +3093 @@
         if(!onbed)return;
 
+        /*Depth Averaging Vx and Vy*/
+        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
+        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
+
         /*Spawn Tria element from the base of the Penta: */
         tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
         tria->CreatePVector(pg);
         delete tria;
-        this-inputs->DeleteInput(VxAverageEnum);
-        this-inputs->DeleteInput(VyAverageEnum);
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
         return;
 }
@@ -3106 +3128 @@
         /*Is this element on the bed? :*/
         if(!onbed)return;
+
+        /*Depth Averaging Vx and Vy*/
+        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
+        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
 
         /*Spawn Tria element from the base of the Penta: */
@@ -3111 +3137 @@
         tria->CreatePVector(pg);
         delete tria;
-        this-inputs->DeleteInput(VxAverageEnum);
-        this-inputs->DeleteInput(VyAverageEnum);
+
+        /*Delete Vx and Vy averaged*/
+        this->inputs->DeleteInput(VxAverageEnum);
+        this->inputs->DeleteInput(VyAverageEnum);
+
         return;
 }
@@ -3901 +3930 @@
         if(!onbed)return;
 
+        /*Depth Averaging Vx and Vy*/
+        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
+        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
+
         /*Spawn Tria element from the base of the Penta: */
         tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
         tria->CreatePVector(pg);
         delete tria;
+
+        /*Delete Vx and Vy averaged*/
         this-inputs->DeleteInput(VxAverageEnum);
         this-inputs->DeleteInput(VyAverageEnum);
+
         return;
 }
 /*}}}*/
 /*FUNCTION Penta::CreatePVectorSlope {{{1*/
-
 void Penta::CreatePVectorSlope( Vec pg){