From bbe7df469c40beb309542c01f25c262340978629 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 15 Sep 2016 08:04:34 +0000
Subject: [PATCH] Merge branch 'pegs'
---
src/restore.c | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 196df76..086bf1c 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -168,6 +168,13 @@
if ((!xmlStrcmp(child->name, (const xmlChar *)"nucleus"))){
parseTrisurfNucleus(vesicle, doc, child);
}
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"constant_volume"))){
+ parseTrisurfConstantVolume(doc, child);
+ }
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"constant_area"))){
+ parseTrisurfConstantArea(doc, child);
+ }
+
child = child->next;
}
@@ -182,6 +189,21 @@
/* Low level tags parsers */
+ts_bool parseTrisurfConstantVolume(xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *cvol = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ char *n=(char *)cvol;
+ V0=atof(n);
+ xmlFree(cvol);
+ return TS_SUCCESS;
+}
+ts_bool parseTrisurfConstantArea(xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *carea = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ char *n=(char *)carea;
+ A0=atof(n);
+ xmlFree(carea);
+ return TS_SUCCESS;
+}
+
ts_bool parseTrisurfNucleus(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur){
xmlChar *coords = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
char *n=(char *)coords;
@@ -350,6 +372,7 @@
char *b;
int idx, polyidx;
char *token[2];
+ int temp_cnt=0;
while (child != NULL) {
conname=xmlGetProp(child, (xmlChar *)"Name");
if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(conname, (const xmlChar *)"connectivity") ){
@@ -361,11 +384,15 @@
while(token[0]!=NULL){
if(idx<3*(vesicle->vlist->n-2)){
bond_add(vesicle->blist, vesicle->vlist->vtx[atoi(token[0])], vesicle->vlist->vtx[atoi(token[1])]);
+ //fprintf(stderr,"Bonds in vesicle count idx=%d\n",idx);
}
else {
//find grafted vtx
if(vesicle->tape->npoly && vesicle->tape->nmono && (vesicle->tape->nmono-1)==(idx-3*(vesicle->vlist->n-2))%(vesicle->tape->nmono)
- && idx<(3*vesicle->vlist->n-2+vesicle->tape->nmono*vesicle->tape->npoly+vesicle->tape->npoly)){
+ && idx<(3*vesicle->vlist->n-2+vesicle->tape->nmono*vesicle->tape->npoly)){
+ temp_cnt++;
+ //fprintf(stderr,"%d: Bonds in poly count idx=%d, t1=%s t2=%s\n",temp_cnt,idx, token[0], token[1]);
+
polyidx=(idx-3*(vesicle->vlist->n-2))/(vesicle->tape->nmono);
//fprintf(stderr,"poly=%d, vertex=%d\n",polyidx,atoi(token[0]));
vesicle->poly_list->poly[polyidx]->grafted_vtx=vesicle->vlist->vtx[atoi(token[0])];
--
Gitblit v1.9.3