From e9ac7bb212f9909ff228708d97878fee5eac8ba6 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 29 Feb 2016 07:30:10 +0000
Subject: [PATCH] Found bug. Tria j==1
---
src/restore.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 13617c3..0ca42ec 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -10,6 +10,9 @@
#include "vesicle.h"
#include "vertex.h"
#include "triangle.h"
+#include "bond.h"
+#include "energy.h"
+#include "initial_distribution.h"
ts_bool parseDump(char *dumpfname) {
xmlDocPtr doc;
@@ -51,6 +54,8 @@
}
if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
fprintf(stderr,"Found cell(Bonds) data\n");
+ if(vesicle!=NULL)
+ parseXMLBonds(vesicle, doc, cur);
}
cur2=cur2->next;
}
@@ -63,6 +68,11 @@
}
xmlFreeDoc(doc);
+ init_normal_vectors(vesicle->tlist);
+ mean_curvature_and_energy(vesicle);
+
+/* TODO: cells, polymeres, filaments, core, tape */
+
fprintf(stderr,"Restoration completed\n");
exit(0);
vesicle_free(vesicle);
@@ -129,6 +139,9 @@
if ((!xmlStrcmp(child->name, (const xmlChar *)"tria"))){
parseTrisurfTria(vesicle, doc, child);
}
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"trianeigh"))){
+ parseTrisurfTriaNeigh(vesicle, doc, child);
+ }
if ((!xmlStrcmp(child->name, (const xmlChar *)"tristar"))){
parseTrisurfTristar(vesicle, doc, child);
}
@@ -191,6 +204,29 @@
}
+ts_bool parseTrisurfTriaNeigh(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *triangles;
+ char *tria;
+ char *ntria[3];
+ ts_uint i,j;
+ triangles = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ tria=(char *)triangles;
+ for(i=0;i<3;i++) ntria[i]=strtok(tria," ");
+ j=0;
+ while(ntria[2]!=NULL){
+ triangle_add_neighbour(vesicle->tlist->tria[j],vesicle->tlist->tria[atoi(ntria[0])]);
+ triangle_add_neighbour(vesicle->tlist->tria[j],vesicle->tlist->tria[atoi(ntria[1])]);
+ triangle_add_neighbour(vesicle->tlist->tria[j],vesicle->tlist->tria[atoi(ntria[2])]);
+ j++;
+ for(i=0;i<3;i++) ntria[i]=strtok(NULL," ");
+ }
+ fprintf(stderr,"Parsing triangle neighbors j=%d\n",j);
+
+ xmlFree(triangles);
+ return TS_SUCCESS;
+}
+
+
ts_bool parseTrisurfTristar(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur){
xmlChar *chari;
@@ -245,5 +281,29 @@
}
return TS_SUCCESS;
}
+ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur){
+ xmlNodePtr child = cur->xmlChildrenNode;
+ xmlChar *bonds;
+ char *b;
+ int i, idx;
+ char *token[2];
+ while (child != NULL) {
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
+ bonds = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
+ b=(char *)bonds;
+ for(i=0;i<2;i++) token[i]=strtok(b," ");
+ 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," ");
+ idx++;
+ }
+ xmlFree(bonds);
+ }
+ child=child->next;
+ }
+ return TS_SUCCESS;
+}
+
--
Gitblit v1.9.3