Changeset 22822 for issm/trunk/src/c/classes/Vertex.cpp

Timestamp:

05/31/18 10:44:24 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22820

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Vertex.cpp (modified) (3 diffs)

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

@@ -32 +32 @@
         this->domaintype     = iomodel->domaintype;
 
+        if(iomodel->Data("md.mesh.lat") && iomodel->Data("md.mesh.long")){
+                this->latitute     = iomodel->Data("md.mesh.lat")[i];
+                this->longitude    = iomodel->Data("md.mesh.long")[i];
+        }
+
         switch(iomodel->domaintype){
                 case Domain3DEnum:
@@ -38 +43 @@
                         break;
                 case Domain3DsurfaceEnum:
+                        _assert_(iomodel->Data("md.mesh.lat") && iomodel->Data("md.mesh.long") && iomodel->Data("md.mesh.r"));
                         this->latitute     = iomodel->Data("md.mesh.lat")[i];
                         this->longitude    = iomodel->Data("md.mesh.long")[i];
@@ -195 +201 @@
 /*}}}*/
 int        Vertex::Sid(void){ return sid; }/*{{{*/
-/*}}}*/
-void       Vertex::ToXYZ(Matrix<IssmDouble>* matrix){/*{{{*/
-
-        IssmDouble xyz[3];
-        int        indices[3];
-
-        if (this->clone==true) return;
-
-        xyz[0]=x;
-        xyz[1]=y; 
-        xyz[2]=z;
-        indices[0]=0;
-        indices[1]=1; 
-        indices[2]=2;
-
-        matrix->SetValues(1,&sid,3,&indices[0],&xyz[0],INS_VAL);
-}
 /*}}}*/
 void       Vertex::UpdateClonePids(int* alltruepids){/*{{{*/