Changeset 18301 for issm/trunk/src/c/bamg/VertexOnGeom.cpp

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/bamg/VertexOnGeom.cpp (modified) (5 diffs)

issm/trunk/src/c/bamg/VertexOnGeom.cpp

@@ -11 +11 @@
 
         /*Constructors/Destructors*/
-        /*FUNCTION VertexOnGeom::VertexOnGeom(){{{*/
-        VertexOnGeom::VertexOnGeom(){
+        VertexOnGeom::VertexOnGeom(){/*{{{*/
                 meshvertex=NULL;
                 curvilincoord=0;
@@ -18 +17 @@
         } 
         /*}}}*/
-        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){{{*/
-        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){
+        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){/*{{{*/
                 meshvertex=&m;
                 curvilincoord=-1;
@@ -25 +23 @@
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){{{*/
-        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){
+        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){/*{{{*/
                 meshvertex=&m;
                 curvilincoord=s;
@@ -34 +31 @@
 
         /*Methods*/
-        /*FUNCTION VertexOnGeom::Set {{{*/
-        void VertexOnGeom::Set(const VertexOnGeom & rec,const Mesh & Th ,Mesh & ThNew){
+        void VertexOnGeom::Set(const VertexOnGeom & rec,const Mesh & Th ,Mesh & ThNew){/*{{{*/
                 *this = rec;  
                 meshvertex = ThNew.vertices + Th.GetId(meshvertex);
@@ -47 +43 @@
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::OnGeomVertex{{{*/
-        int VertexOnGeom::OnGeomVertex()const{
+        int VertexOnGeom::OnGeomVertex()const{/*{{{*/
                 return this? curvilincoord <0 :0;
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::OnGeomEdge{{{*/
-        int VertexOnGeom::OnGeomEdge() const{
+        int VertexOnGeom::OnGeomEdge() const{/*{{{*/
                 return this? curvilincoord >=0 :0;
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::IsRequiredVertex{{{*/
-        int VertexOnGeom::IsRequiredVertex() {
+        int VertexOnGeom::IsRequiredVertex() {/*{{{*/
                 return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0;
         }
         /*}}}*/
-        /*FUNCTION VertexOnGeom::SetOn{{{*/
-        void VertexOnGeom::SetOn(){
+        void VertexOnGeom::SetOn(){/*{{{*/
                 meshvertex->GeomEdgeHook=this;
                 meshvertex->IndexInTriangle=IsVertexOnGeom;