Changeset 20500 for issm/trunk/src/c/classes/Vertex.h

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/classes/Vertex.h (modified) (4 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

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

@@ -28 +28 @@
                 IssmDouble y;
                 IssmDouble z;
+                IssmDouble latitute;
+                IssmDouble longitude;
+                IssmDouble R;
                 IssmDouble sigma;        //sigma coordinate: (z-bed)/thickness
                 int        connectivity; //number of vertices connected to this vertex
@@ -42 +45 @@
                 int   ObjectEnum();
                 Object* copy();
+                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
+
                 /*}}}*/
                 /*Vertex management:*/ 
@@ -50 +55 @@
                 IssmDouble GetY(void); 
                 IssmDouble GetZ(void); 
+                IssmDouble GetLatitude(void); 
+                IssmDouble GetLongitude(void); 
+                IssmDouble GetRadius(void); 
                 void       UpdatePosition(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz,Parameters* parameters,IssmDouble* thickness,IssmDouble* bed);
                 void       DistributePids(int* ppidcount);
@@ -57 +65 @@
                 void       SetClone(int* minranks);
                 void       ToXYZ(Matrix<IssmDouble>* matrix);
-                void       VertexCoordinates(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz);
+                void       VertexCoordinates(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz,bool spherical=false);
 };
 
 /*Methods relating to Vertex object: */
-void GetVerticesCoordinates(IssmDouble* xyz,Vertex** vertices, int numvertices);
+void GetVerticesCoordinates(IssmDouble* xyz,Vertex** vertices, int numvertices,bool spherical=false);
 
 #endif  /* _VERTEX_H */

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad