From d5d78a49c6b51fb1f6f0661d063034eaf65e02f7 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 25 Sep 2019 09:20:36 +0000 Subject: [PATCH] Constant volume and constant area fix. Removed spherical harmonics calculations in simulations. No ulm2.cvs and state.dat files are produced anymore --- src/restore.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/restore.c b/src/restore.c index 989a87b..6e12c1e 100644 --- a/src/restore.c +++ b/src/restore.c @@ -79,11 +79,10 @@ // 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); @@ -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