Changeset 16446

Timestamp:

10/17/13 14:48:22 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying vertex constructors

Location:

issm/trunk-jpl/src/c/classes

Files:

• Vertex.cpp (modified) (1 diff)
• Vertex.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Vertex.cpp

@@ -21 +21 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{*/
-Vertex::Vertex(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){
-        this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma,vertex_connectivity);
-}
-/*}}}*/
 /*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{*/
 Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
 
-        _assert_(iomodel->Data(MeshXEnum) && iomodel->Data(MeshYEnum) && iomodel->Data(MeshZEnum));
-        _assert_(iomodel->Data(BedEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity);
-
-        this->Init(vertex_id, vertex_sid, iomodel->Data(MeshXEnum)[i],iomodel->Data(MeshYEnum)[i],iomodel->Data(MeshZEnum)[i],(iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]),iomodel->numbernodetoelementconnectivity[i]);
-
-}
-/*}}}*/
-/*FUNCTION Vertex::~Vertex() {{{*/
-Vertex::~Vertex(){
-        return;
-}
-/*}}}*/
-/*FUNCTION Vertex::Init{{{*/
-void Vertex::Init(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){
-
-        /*all the initialization has been done by the initializer, just fill in the id: */
         this->id           = vertex_id;
         this->sid          = vertex_sid;
         this->pid          = UNDEF;
-        this->x            = vertex_x;
-        this->y            = vertex_y;
-        this->z            = vertex_z;
-        this->sigma        = vertex_sigma;
-        this->connectivity = vertex_connectivity;
-
+
+        _assert_(iomodel->Data(MeshXEnum) && iomodel->Data(MeshYEnum) && iomodel->Data(MeshZEnum));
+        this->x            = iomodel->Data(MeshXEnum)[i];
+        this->y            = iomodel->Data(MeshYEnum)[i];
+        this->z            = iomodel->Data(MeshZEnum)[i];
+
+        _assert_(iomodel->Data(BedEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity);
+        this->sigma        = (iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]);
+        this->connectivity = iomodel->numbernodetoelementconnectivity[i];
+
+}
+/*}}}*/
+/*FUNCTION Vertex::~Vertex() {{{*/
+Vertex::~Vertex(){
         return;
 }

issm/trunk-jpl/src/c/classes/Vertex.h

@@ -32 +32 @@
                 /*Vertex constructors, destructors {{{*/
                 Vertex();
-                Vertex(int id, int sid,IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma, int connectivity); 
-                void Init(int id, int sid, IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma,int connectivity);
                 Vertex(int id, int sid, int i, IoModel* iomodel);
                 ~Vertex();