From 61ad95ca712a374f6e58127fda738b67c57d743d Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 04 Jan 2017 21:19:52 +0000 Subject: [PATCH] Added many changes to trisurf.py. Mostly readability. Great fix in class Runner by introducing @property tag --- src/restore.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/restore.c b/src/restore.c index 24f98fb..c89ff6d 100644 --- a/src/restore.c +++ b/src/restore.c @@ -85,6 +85,7 @@ init_normal_vectors(vesicle->tlist); mean_curvature_and_energy(vesicle); + sweep_attraction_bond_energy(vesicle); /* TODO: filaments */ @@ -186,7 +187,6 @@ vesicle->tape=tape; set_vesicle_values_from_tape(vesicle); - return vesicle; } @@ -417,6 +417,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") ){ @@ -428,11 +429,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