Changeset 3469

Timestamp:

04/08/10 11:31:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor debugging

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (3 diffs)
• EnumDefinitions/EnumDefinitions.cpp (modified) (1 diff)
• objects/Vertex.cpp (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -150 +150 @@
 }
 /*}}}*/
-/*FUNCTION DataSetDemarshall{{{1*/
+/*FUNCTION DataSet::Demarshall{{{1*/
 DataSet* DataSetDemarshall(char* marshalled_dataset){
 
@@ -194 +194 @@
                         dataset->AddObject(node);
                 }
+                else if(enum_type==VertexEnum()){
+                        Vertex* vertex=NULL;
+                        vertex=new Vertex();
+                        vertex->Demarshall(&marshalled_dataset);
+                        dataset->AddObject(vertex);
+                }
                 else if(enum_type==ParamEnum()){
                         Param* param=NULL;
@@ -959 +965 @@
                 dofobject=(DofObject*)(*object);
                 dofobject->DistributeDofs(&dofcount);
-
         
         }

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.cpp

@@ -80 +80 @@
 
 /*Grids: */
-int VertexEnum(void){                         return        420; }
+int VertexEnum(void){                       return          420; }
 int NodeEnum(void){                         return          421; }
 /*Loads: */

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

@@ -215 +215 @@
 /*}}}*/
 /*}}}*/
-/* DofObject routines: {{{1*
+/* DofObject routines: {{{1*/
 /*FUNCTION Vertex DistributeDofs{{{2*/
 void  Vertex::DistributeDofs(int* pdofcount){