Changeset 16232

Timestamp:

09/23/13 10:34:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed legacy code

Location:

issm/trunk-jpl/src/c

Files:

• bamg/AdjacentTriangle.cpp (modified) (1 diff)
• bamg/AdjacentTriangle.h (modified) (1 diff)
• classes/Loads/Riftfront.cpp (modified) (1 diff)
• classes/Loads/Riftfront.h (modified) (1 diff)
• modules/OutputRiftsx (deleted)

issm/trunk-jpl/src/c/bamg/AdjacentTriangle.cpp

@@ -44 +44 @@
         }
         /*}}}*/
-        /*FUNCTION AdjacentTriangle::OppositeVertex {{{*/
-        BamgVertex* AdjacentTriangle::OppositeVertex() const {
-                return t->vertices[bamg::OppositeVertex[a]]; 
-        }
-        /*}}}*/
         /*FUNCTION AdjacentTriangle::det {{{*/
         Icoor2 & AdjacentTriangle::det() const {

issm/trunk-jpl/src/c/bamg/AdjacentTriangle.h

@@ -38 +38 @@
                         AdjacentTriangle Adj() const;
                         BamgVertex* EdgeVertex(const int & i) const;
-                        BamgVertex* OppositeVertex() const;
                         Icoor2& det() const;
         };

issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

@@ -733 +733 @@
 }
 /*}}}*/
-/*FUNCTION Riftfront::MaxPenetration {{{*/
-int   Riftfront::MaxPenetration(IssmDouble* ppenetration){
-
-        IssmDouble penetration;
-        IssmDouble vx1;
-        IssmDouble vy1;
-        IssmDouble vx2;
-        IssmDouble vy2;
-
-        /*Objects: */
-        Tria  *tria1 = NULL;
-        Tria  *tria2 = NULL;
-
-        /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
-
-        /*recover elements on both side of rift: */
-        tria1=(Tria*)elements[0];
-        tria2=(Tria*)elements[1];
-
-        /*recover velocity: */
-        tria1->GetInputValue(&vx1,nodes[0],VxEnum);
-        tria2->GetInputValue(&vx2,nodes[1],VxEnum);
-        tria1->GetInputValue(&vy1,nodes[0],VyEnum);
-        tria2->GetInputValue(&vy2,nodes[1],VyEnum);
-
-        /*Node1 faces node2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
-        penetration=(vx2-vx1)*normal[0]+(vy2-vy1)*normal[1];
-
-        /*Now, we return penetration only if we are active!: */
-        if(this->active==0) penetration=-1.;
-
-        /*If we are zigzag locked, same thing: */
-        if(this->counter>this->penalty_lock) penetration=-1.;
-
-        /*assign output pointer: */
-        *ppenetration=penetration;
-        return 1;
-}
-/*}}}*/
-/*FUNCTION Riftfront::Penetration {{{*/
-int   Riftfront::Penetration(IssmDouble* ppenetration){
-
-        IssmDouble    vx1;
-        IssmDouble    vy1;
-        IssmDouble    vx2;
-        IssmDouble    vy2;
-
-        IssmDouble    penetration;
-
-        /*Objects: */
-        Tria     *tria1       = NULL;
-        Tria     *tria2       = NULL;
-
-        /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
-
-        /*recover elements on both side of rift: */
-        tria1=(Tria*)elements[0];
-        tria2=(Tria*)elements[1];
-
-        /*First recover velocity: */
-        tria1->GetInputValue(&vx1,nodes[0],VxEnum);
-        tria2->GetInputValue(&vx2,nodes[1],VxEnum);
-        tria1->GetInputValue(&vy1,nodes[0],VyEnum);
-        tria2->GetInputValue(&vy2,nodes[1],VyEnum);
-
-        /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */
-        penetration=(vx2-vx1)*normal[0]+(vy2-vy1)*normal[1];
-
-        /*Now, we return penetration only if we are active!: */
-        if(this->active==0)penetration=0;
-
-        /*assign output pointer: */
-        *ppenetration=penetration;
-        return 1;
-}
-/*}}}*/
 /*FUNCTION Riftfront::PotentialUnstableConstraint {{{*/
 int   Riftfront::PotentialUnstableConstraint(int* punstable){

issm/trunk-jpl/src/c/classes/Loads/Riftfront.h

@@ -93 +93 @@
                 void  FreezeConstraints(void);
                 bool  IsFrozen(void);
-                int   Penetration(IssmDouble* ppenetration);
-                int   MaxPenetration(IssmDouble* ppenetration);
                 int   PotentialUnstableConstraint(int* punstable);
                 bool  IsInput(int name);