Changeset 16237

Timestamp:

09/23/13 13:49:40 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed unsued code

Location:

issm/trunk-jpl/src/c

Files:

• CMakeLists.txt (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• bamg/EigenMetric.cpp (modified) (1 diff)
• bamg/Geometry.cpp (modified) (1 diff)
• bamg/Geometry.h (modified) (1 diff)
• bamg/Mesh.cpp (modified) (4 diffs)
• bamg/Metric.h (modified) (1 diff)
• bamg/Triangle.cpp (modified) (1 diff)
• bamg/Triangle.h (modified) (1 diff)
• classes/Loads/Riftfront.cpp (modified) (1 diff)
• classes/Loads/Riftfront.h (modified) (1 diff)
• modules/InputArtificialNoisex (deleted)
• modules/modules.h (modified) (1 diff)

issm/trunk-jpl/src/c/CMakeLists.txt

@@ -57 +57 @@
                           $ENV{ISSM_DIR}/src/c/modules/GetVectorFromInputsx 
                           $ENV{ISSM_DIR}/src/c/modules/InputUpdateFromVectorx 
-                          $ENV{ISSM_DIR}/src/c/modules/InputArtificialNoisex 
                           $ENV{ISSM_DIR}/src/c/modules/ConfigureObjectsx 
                           $ENV{ISSM_DIR}/src/c/modules/ComputeBasalStressx 
@@ -206 +205 @@
                                         ./modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp
                                         ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp
-                                        ./modules/InputArtificialNoisex/InputArtificialNoisex.cpp
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp
                                         ./modules/ComputeBasalStressx/ComputeBasalStressx.cpp

issm/trunk-jpl/src/c/Makefile.am

@@ -298 +298 @@
                                         ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\
                                         ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\
-                                        ./modules/InputArtificialNoisex/InputArtificialNoisex.h\
-                                        ./modules/InputArtificialNoisex/InputArtificialNoisex.cpp\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\

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

@@ -99 +99 @@
                 lambda1=bamg::Abs(lambda1),lambda2=bamg::Abs(lambda2);
         }/*}}}*/
-        /*FUNCTION EigenMetric::Aniso{{{*/
-        double EigenMetric::Aniso() const  { 
-                return sqrt( Aniso2());
-        }/*}}}*/
         /*FUNCTION EigenMetric::Aniso2{{{*/
         double EigenMetric::Aniso2() const  { 
                 return lmax()/lmin();
-        }/*}}}*/
-        /*FUNCTION EigenMetric::BoundAniso{{{*/
-        void   EigenMetric::BoundAniso(const double c){ 
-                BoundAniso2(1/(c*c));
         }/*}}}*/
         /*FUNCTION EigenMetric::Echo {{{*/

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

@@ -463 +463 @@
                 return c - curves;
         }/*}}}*/
-        /*FUNCTION Geometry::Containing{{{*/
-        GeomEdge* Geometry::Containing(const R2 P,  GeomEdge * start) const {
-                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/Contening)*/
-
-                GeomEdge* on =start,* pon=0;
-                // walk with the cos on geometry
-                int counter=0;
-                while(pon != on){  
-                        counter++;
-                        _assert_(counter<100);
-                        pon = on;
-                        R2 A= (*on)[0];
-                        R2 B= (*on)[1];
-                        R2 AB = B-A;
-                        R2 AP = P-A;
-                        R2 BP = P-B;
-                        if ( (AB,AP) < 0) 
-                         on = on->Adj[0];
-                        else if ( (AB,BP)  > 0) 
-                         on = on->Adj[1];
-                        else
-                         return on;
-                }
-                return on;
-        }
-        /*}}}*/
         /*FUNCTION Geometry::PostRead{{{*/
         void Geometry::PostRead(){

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

@@ -60 +60 @@
                         long             GetId(const Curve *c) const;
                         void             UnMarkEdges();
-                        GeomEdge *ProjectOnCurve(const Edge &,double,BamgVertex &,VertexOnGeom &) const;
-                        GeomEdge *Containing(const R2 P, GeomEdge *start) const;
+                        GeomEdge        *ProjectOnCurve(const Edge &,double,BamgVertex &,VertexOnGeom &) const;
                         void             WriteGeometry(BamgGeom *bamggeom, BamgOpts*bamgopts);
         };

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

@@ -139 +139 @@
                                 nbt++;           
                           }
-                  if (kt!=nbt){
-                          _error_("kt!=nbt");
-                  }
                   if (nbt==0 && nbv==0) {
                           _error_("All triangles have been removed");
@@ -148 +145 @@
                   delete [] reft;
                   delete [] refv;
-                  //double cutoffradian = 10.0/180.0*Pi;
                   BuildGeometryFromMesh(bamgopts);
                   Gh.PostRead(); 
@@ -154 +150 @@
                   ReconstructExistingMesh();
 
-                  if (!nbsubdomains){
-                          _error_("nbsubdomains==0");
-                  }
-                  if (!subdomains[0].head || !subdomains[0].head->link){
-                          _error_("!subdomains[0].head || !subdomains[0].head->link");
-                  }
-
+                  /*Final checks*/
+                  _assert_(kt==nbt);
+                  _assert_(nbsubdomains);
+                  _assert_(subdomains[0].head && subdomains[0].head->link); 
           }
         /*}}}*/
@@ -1725 +1718 @@
                         long i1 = GetId(triangles[it][VerticesOfTriangularEdge[j][1]]);
                         k = edge4->SortAndFind(i0,i1);
-                        if(k>=0){
-                                subdomains[i].direction = (vertices + i0 == edges[k].v[0]) ? 1 : -1;
-                                subdomains[i].edge = edges+k;
-                                Gh.subdomains[i].edge = Gh.edges + k;
-                                Gh.subdomains[i].direction  =  subdomains[i].direction;
-                                Gh.subdomains[i].ReferenceNumber =  subdomains[i].ReferenceNumber;
-                        }
-                        else
-                         _error_("%i should be >=0");
-                  }
+                        _assert_(k>=0);
+                        subdomains[i].direction = (vertices + i0 == edges[k].v[0]) ? 1 : -1;
+                        subdomains[i].edge = edges+k;
+                        Gh.subdomains[i].edge = Gh.edges + k;
+                        Gh.subdomains[i].direction  =  subdomains[i].direction;
+                        Gh.subdomains[i].ReferenceNumber =  subdomains[i].ReferenceNumber;
+                }
 
                 delete edge4;

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

@@ -77 +77 @@
                         double lmin()   const;
                         double Aniso2() const;
-                        double Aniso()  const;
-                        void   BoundAniso(const  double c);
                         inline void BoundAniso2(const double coef);
 

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

@@ -251 +251 @@
                         t->AdjEdgeIndex[aat]=a;
                 }
-        }/*}}}*/
-        /*FUNCTION Triangle::SetAllFlag{{{*/
-        void   Triangle::SetAllFlag(int a,int f){
-                AdjEdgeIndex[a] = (AdjEdgeIndex[a] &3) + (1020 & f);
         }/*}}}*/
         /*FUNCTION Triangle::SetHidden{{{*/

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

@@ -46 +46 @@
                         int               Hidden(int a)const;
                         int               GetAllflag(int a);
-                        void              SetAllFlag(int a,int f);
                         double            QualityQuad(int a,int option=1) const;
                         short             NuEdgeTriangleAdj(int i) const;

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

@@ -733 +733 @@
 }
 /*}}}*/
-/*FUNCTION Riftfront::PotentialUnstableConstraint {{{*/
-int   Riftfront::PotentialUnstableConstraint(int* punstable){
-
-        IssmDouble  penetration;
-        int         unstable;
-        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];
-
-        /*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];
-
-        /*Ok, we are looking for positive penetration in an active constraint: */
-        if(this->active){
-                if (penetration>=0){
-                        unstable=1;
-                }
-                else{
-                        unstable=0;
-                }
-        }
-        else{
-                unstable=0;
-        }
-
-        /*assign output pointer: */
-        *punstable=unstable;
-        return 1;
-}
-/*}}}*/
-/*FUNCTION Riftfront::PreConstrain {{{*/
-int   Riftfront::PreConstrain(int* punstable){
-
-        IssmDouble  penetration;
-        int         unstable;
-        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];
-
-        /*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];
-
-        /*Ok, we are preconstraining here. Ie, anything that penetrates is constrained until stability of the entire set 
-         * of constraints is reached.: */
-        if(penetration<0){
-                if (!this->active){
-                        /*This is the first time penetration happens: */
-                        this->active=1;
-                        unstable=1;
-                }
-                else{
-                        /*This constraint was already active: */
-                        this->active=1;
-                        unstable=0;
-                }
-        }
-        else{
-                /*No penetration happening. : */
-                if (!this->active){
-                        /*This penalty was not active, and no penetration happening. Do nonthing: */
-                        this->active=0;
-                        unstable=0; 
-                }
-                else{
-                        /*Ok, this penalty wants to get released. But not now, this is preconstraint, not constraint: */
-                        this->active=1;
-                        unstable=0;
-                }
-        }
-
-        /*assign output pointer: */
-        *punstable=unstable;
-        return 1;
-}
-/*}}}*/
-/*FUNCTION Riftfront::PreStable {{{*/
-bool  Riftfront::PreStable(){
-        return prestable;
-}
-/*}}}*/
-/*FUNCTION Riftfront::SetPreStable {{{*/
-void Riftfront::SetPreStable(){
-        prestable=1;
-}
-/*}}}*/
 /*FUNCTION Riftfront::IsInput{{{*/
 bool Riftfront::IsInput(int name){

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

@@ -85 +85 @@
                 /*}}}*/
                 /*Riftfront specific routines: {{{*/
-                bool  PreStable();
                 ElementMatrix* PenaltyCreateKMatrixStressbalanceHoriz(IssmDouble kmax);
                 ElementVector* PenaltyCreatePVectorStressbalanceHoriz(IssmDouble kmax);
-                void  SetPreStable();
-                int   PreConstrain(int* punstable);
                 int   Constrain(int* punstable);
                 void  FreezeConstraints(void);
                 bool  IsFrozen(void);
-                int   PotentialUnstableConstraint(int* punstable);
                 bool  IsInput(int name);
                 /*}}}*/
 };
-
 #endif  /* _RIFTFRONT_H_ */

issm/trunk-jpl/src/c/modules/modules.h

@@ -51 +51 @@
 #include "./InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h"
 #include "./InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h"
-#include "./InputArtificialNoisex/InputArtificialNoisex.h"
 #include "./IoModelToConstraintsx/IoModelToConstraintsx.h"
 #include "./KMLFileReadx/KMLFileReadx.h"