Dump and restore seems equal to original in paraview.

Samo Penic

2016-02-29 ecdd71929b38a504e2b0ae1a9c105a5e1ac28e4a

 src/restore.c

@@ -50,12 +50,12 @@
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Points"))){
                     fprintf(stderr,"Found point data\n");
                     if(vesicle!=NULL)
                        parseXMLVertexPosition(vesicle, doc, cur);
                        parseXMLVertexPosition(vesicle, doc, cur2);
                  }
                  if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
                  fprintf(stderr,"Found cell(Bonds) data\n");
                     if(vesicle!=NULL)
                        parseXMLBonds(vesicle, doc, cur);
                        parseXMLBonds(vesicle, doc, cur2);
                  }
                  cur2=cur2->next;
               }   
@@ -74,8 +74,9 @@
/* TODO: cells, polymeres, filaments, core, tape */

   fprintf(stderr,"Restoration completed\n");
   exit(0);
   write_vertex_xml_file(vesicle,999);
   vesicle_free(vesicle);
   exit(0);
   return TS_SUCCESS;
}

@@ -190,14 +191,18 @@
   char *tria;
   char *vtx[3];
   
   ts_uint i;
   ts_uint i,j;
   triangles = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
   tria=(char *)triangles;
   for(i=0;i<3;i++)   vtx[i]=strtok(tria," ");
   vtx[0]=strtok(tria," ");
   for(i=1;i<3;i++)   vtx[i]=strtok(NULL," ");
   j=0;
   while(vtx[2]!=NULL){
      triangle_add(vesicle->tlist, vesicle->vlist->vtx[atoi(vtx[0])],vesicle->vlist->vtx[atoi(vtx[1])],vesicle->vlist->vtx[atoi(vtx[2])]);
      for(i=0;i<3;i++)   vtx[i]=strtok(NULL," ");
      j++;
   }   
   fprintf(stderr,"Parsing triangles %s j=%d\n",triangles,j);	

   xmlFree(triangles);
   return TS_SUCCESS;
@@ -211,7 +216,8 @@
   ts_uint i,j;
   triangles = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
   tria=(char *)triangles;
   for(i=0;i<3;i++)   ntria[i]=strtok(tria," ");
   ntria[0]=strtok(tria," ");
   for(i=1;i<3;i++)   ntria[i]=strtok(NULL," ");
   j=0;
   while(ntria[2]!=NULL){
      triangle_add_neighbour(vesicle->tlist->tria[j],vesicle->tlist->tria[atoi(ntria[0])]);
@@ -266,42 +272,50 @@
      if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
         points = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
         pts=(char *)points;
         for(i=0;i<3;i++)   token[i]=strtok(pts," ");
         token[0]=strtok(pts," ");
         token[1]=strtok(NULL," ");
         token[2]=strtok(NULL,"\n");
         idx=0;
         while(token[0]!=NULL){
            vesicle->vlist->vtx[idx]->x=atof(token[0]);
            vesicle->vlist->vtx[idx]->y=atof(token[1]);
            vesicle->vlist->vtx[idx]->z=atof(token[2]);
            for(i=0;i<3;i++)   token[i]=strtok(NULL," ");	
            for(i=0;i<2;i++)   token[i]=strtok(NULL," ");	
            token[2]=strtok(NULL,"\n");
            idx++;
         }
         xmlFree(points);
      }
      child=child->next;
   }
   fprintf(stderr,"Vertices position j=%d\n",idx);	

   return TS_SUCCESS;
}
ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur){
   xmlNodePtr child = cur->xmlChildrenNode;
   xmlChar *bonds;
   char *b;
   int i, idx;
   int idx;
   char *token[2];
   while (child != NULL) {
      if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
      if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(xmlGetProp(child, (xmlChar *)"Name"), (const xmlChar *)"connectivity") ){
         bonds = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
         b=(char *)bonds;
         for(i=0;i<2;i++)   token[i]=strtok(b," ");
         token[0]=strtok(b," ");
         token[1]=strtok(NULL,"\n");
         idx=0;
         while(token[0]!=NULL){
            bond_add(vesicle->blist, vesicle->vlist->vtx[atoi(token[0])], vesicle->vlist->vtx[atoi(token[1])]);
            for(i=0;i<2;i++)   token[i]=strtok(NULL," ");	
            token[0]=strtok(NULL," ");	
            token[1]=strtok(NULL,"\n");	
            idx++;
         }
         xmlFree(bonds);
      }
      child=child->next;
   }
   fprintf(stderr,"Bond data j=%d\n",idx);	
   return TS_SUCCESS;
}