From 3006183b769f2e126b1a96e6bf697c2b7f657df7 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 26 Apr 2020 17:35:26 +0000
Subject: [PATCH] Code for incremental adding of inclusions done
---
src/restore.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 111d89b..6e12c1e 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -79,16 +79,15 @@
// END Point Position data & Bonds
cur = cur->next;
}
-
xmlFreeDoc(doc);
// vesicle->poly_list=init_poly_list(0, 0, vesicle->vlist, vesicle);
-
+ set_vesicle_values_from_tape(vesicle);
init_normal_vectors(vesicle->tlist);
mean_curvature_and_energy(vesicle);
sweep_attraction_bond_energy(vesicle);
if(vesicle->tape->stretchswitch==1){
- vesicle->tlist->a0=sqrt(3)/2.0*pow((vesicle->tape->dmax+1.0)/2.0,2);
+ vesicle->tlist->a0=sqrt(3)/4.0*pow((vesicle->tape->dmax+1.0)/2.0,2);
for(i=0;i<vesicle->tlist->n;i++){
stretchenergy(vesicle, vesicle->tlist->tria[i]);
}
@@ -157,7 +156,8 @@
//fprintf(stderr,"nvtx=%u\n",atoi((char *)nvtx));
//TODO: check if nvtx is in agreement with nshell from tape
ts_vesicle *vesicle=init_vesicle(atoi((char *)nvtx),tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
- //vesicle->poly_list=init_poly_list(atoi((char *)npoly),atoi((char *)nmono), vesicle->vlist, vesicle);
+// vesicle->poly_list=init_poly_list(atoi((char *)npoly),atoi((char *)nmono), vesicle->vlist, vesicle);
+ vesicle->poly_list=init_empty_poly_list(atoi((char *)npoly),atoi((char *)nmono));
xmlFree(nvtx);
xmlFree(npoly);
xmlFree(nmono);
@@ -190,9 +190,8 @@
child = child->next;
}
-
vesicle->tape=tape;
- set_vesicle_values_from_tape(vesicle);
+// set_vesicle_values_from_tape(vesicle);
return vesicle;
}
--
Gitblit v1.9.3