Changeset 4925


Ignore:
Timestamp:
08/02/10 13:05:05 (15 years ago)
Author:
Mathieu Morlighem
Message:

Delete Added inputs after spawning Tria

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r4924 r4925  
    19691969        tria->CreateKMatrix(Kgg);
    19701970        delete tria;
     1971
     1972        /*Delete Vx and Vy averaged*/
     1973        this->inputs->DeleteInput(VxAverageEnum);
     1974        this->inputs->DeleteInput(VyAverageEnum);
     1975
    19711976        return;
    19721977
     
    20022007        tria->CreateKMatrix(Kgg);
    20032008        delete tria;
     2009
     2010        /*Delete Vx and Vy averaged*/
     2011        this->inputs->DeleteInput(VxAverageEnum);
     2012        this->inputs->DeleteInput(VyAverageEnum);
     2013
    20042014        return;
    20052015
     
    27802790        tria->CreateKMatrix(Kgg);
    27812791        delete tria;
     2792
     2793        /*Delete Vx and Vy averaged*/
     2794        this->inputs->DeleteInput(VxAverageEnum);
     2795        this->inputs->DeleteInput(VyAverageEnum);
     2796
    27822797        return;
    27832798
     
    30783093        if(!onbed)return;
    30793094
     3095        /*Depth Averaging Vx and Vy*/
     3096        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
     3097        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
     3098
    30803099        /*Spawn Tria element from the base of the Penta: */
    30813100        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
    30823101        tria->CreatePVector(pg);
    30833102        delete tria;
    3084         this-inputs->DeleteInput(VxAverageEnum);
    3085         this-inputs->DeleteInput(VyAverageEnum);
     3103
     3104        /*Delete Vx and Vy averaged*/
     3105        this->inputs->DeleteInput(VxAverageEnum);
     3106        this->inputs->DeleteInput(VyAverageEnum);
     3107
    30863108        return;
    30873109}
     
    31063128        /*Is this element on the bed? :*/
    31073129        if(!onbed)return;
     3130
     3131        /*Depth Averaging Vx and Vy*/
     3132        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
     3133        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
    31083134
    31093135        /*Spawn Tria element from the base of the Penta: */
     
    31113137        tria->CreatePVector(pg);
    31123138        delete tria;
    3113         this-inputs->DeleteInput(VxAverageEnum);
    3114         this-inputs->DeleteInput(VyAverageEnum);
     3139
     3140        /*Delete Vx and Vy averaged*/
     3141        this->inputs->DeleteInput(VxAverageEnum);
     3142        this->inputs->DeleteInput(VyAverageEnum);
     3143
    31153144        return;
    31163145}
     
    39013930        if(!onbed)return;
    39023931
     3932        /*Depth Averaging Vx and Vy*/
     3933        this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
     3934        this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
     3935
    39033936        /*Spawn Tria element from the base of the Penta: */
    39043937        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
    39053938        tria->CreatePVector(pg);
    39063939        delete tria;
     3940
     3941        /*Delete Vx and Vy averaged*/
    39073942        this-inputs->DeleteInput(VxAverageEnum);
    39083943        this-inputs->DeleteInput(VyAverageEnum);
     3944
    39093945        return;
    39103946}
    39113947/*}}}*/
    39123948/*FUNCTION Penta::CreatePVectorSlope {{{1*/
    3913 
    39143949void Penta::CreatePVectorSlope( Vec pg){
    39153950
Note: See TracChangeset for help on using the changeset viewer.