Changeset 19199

Timestamp:

03/16/15 16:37:24 (10 years ago)

Author:

Eric.Larour

Message:

CHG: implemented marshalling of Vertex, Node and DofIndexing.

Location:

issm/trunk-jpl/src/c/classes

Files:

• DofIndexing.cpp (modified) (2 diffs)
• DofIndexing.h (modified) (1 diff)
• Node.cpp (modified) (1 diff)
• Node.h (modified) (1 diff)
• Vertex.cpp (modified) (1 diff)
• Vertex.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/DofIndexing.cpp ¶

@@ -15 +15 @@
 #include "../shared/Numerics/constants.h"
 #include "../shared/io/Print/Print.h"
+#include "../shared/io/Marshalling/Marshalling.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
@@ -294 +295 @@
 }
 /*}}}*/
+void DofIndexing::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+
+        MARSHALLING(gsize);
+        MARSHALLING(fsize);
+        MARSHALLING(ssize);
+        MARSHALLING(clone);
+        MARSHALLING(active);
+        MARSHALLING_DYNAMIC(f_set,bool,fsize);
+        MARSHALLING_DYNAMIC(s_set,bool,ssize);
+        MARSHALLING_DYNAMIC(svalues,IssmDouble,gsize);
+        MARSHALLING_DYNAMIC(doftype,int,gsize);
+        MARSHALLING_DYNAMIC(gdoflist,int,gsize);
+        MARSHALLING_DYNAMIC(fdoflist,int,fsize);
+        MARSHALLING_DYNAMIC(sdoflist,int,ssize);
+
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/DofIndexing.h ¶

@@ -47 +47 @@
                 void  DeepEcho(void); 
                 void  copy(const DofIndexing& in);
+                void    Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
                 /*}}}*/
                 /*DofIndexing management: {{{*/

issm/trunk-jpl/src/c/classes/Node.cpp ¶

@@ -151 +151 @@
 }
 /*}}}*/
+void Node::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+
+        MARSHALLING_ENUM(NodeEnum);
+        MARSHALLING(id);
+        MARSHALLING(sid);
+        MARSHALLING(lid);
+        MARSHALLING(indexingupdate);
+        indexing.Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        MARSHALLING(analysis_enum);
+        MARSHALLING_ARRAY(coord_system,IssmDouble,9);
+
+}
+/*}}}*/
 
 /*Object virtual functions definitions:*/

issm/trunk-jpl/src/c/classes/Node.h ¶

@@ -50 +50 @@
                 int     ObjectEnum();
                 Object *copy();
-                void    Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
+                void    Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
 
                 /*Node numerical routines*/

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

@@ -88 +88 @@
 
         return new Vertex(*this); 
+
+}
+/*}}}*/
+void Vertex::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+
+        MARSHALLING_ENUM(VertexEnum);
+        MARSHALLING(clone);
+        MARSHALLING(domaintype);
+        MARSHALLING(id);
+        MARSHALLING(sid);
+        MARSHALLING(pid);
+        MARSHALLING(x);
+        MARSHALLING(y);
+        MARSHALLING(z);
+        MARSHALLING(sigma);
+        MARSHALLING(connectivity);
 
 }

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

@@ -42 +42 @@
                 int   ObjectEnum();
                 Object* copy();
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
+                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
 
                 /*}}}*/