From a3dbf0899f9a077c025136336b597ae9b22e414f Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Fri, 26 Feb 2016 10:34:38 +0000
Subject: [PATCH] Basic vesicle is dumped and restored, however, memory is not ok.
---
src/restore.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 13617c3..94e2621 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);
@@ -245,5 +255,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