From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/restore.c | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 6267377..1d4d7f8 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -17,6 +17,7 @@
#include "initial_distribution.h"
#include "io.h"
#include <math.h>
+#include "globals.h"
ts_vesicle *parseDump(char *dumpfname) {
xmlDocPtr doc;
@@ -79,16 +80,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*pow((vesicle->tape->dmax+1.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 +157,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 +191,8 @@
child = child->next;
}
-
vesicle->tape=tape;
- set_vesicle_values_from_tape(vesicle);
+// set_vesicle_values_from_tape(vesicle);
return vesicle;
}
@@ -363,6 +363,29 @@
}
xmlFree(values);
}
+ if(!xmlStrcmp(property_name,(const xmlChar *)"direct_interaction_force")){
+ values=xmlNodeListGetString(doc,child->xmlChildrenNode,1);
+ vals=(char *)values;
+ token=strtok(vals," ");
+ idx=0;
+ while(token!=NULL){
+ if(idx<vesicle->vlist->n){
+ vesicle->vlist->vtx[idx]->direct_interaction_force=atof(token);
+ } else if(vesicle->tape->nmono && vesicle->tape->npoly && idx<vesicle->vlist->n+vesicle->tape->nmono*vesicle->tape->npoly) {
+ polyidx=(idx-vesicle->vlist->n)/vesicle->tape->nmono;
+ monoidx=(idx-vesicle->vlist->n)%vesicle->tape->nmono;
+ vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->direct_interaction_force=atof(token);
+ } else {
+ filidx=(idx-vesicle->vlist->n-vesicle->tape->nmono*vesicle->tape->npoly)/vesicle->tape->nfono;
+ fonoidx=(idx-vesicle->vlist->n-vesicle->tape->nmono*vesicle->tape->npoly)%vesicle->tape->nfono;
+ //fprintf(stderr,"filidx=%d, fonoidx=%d, coord=%s,%s,%s\n",filidx,fonoidx,token[0],token[1],token[2]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->direct_interaction_force=atof(token);
+ }
+ idx++;
+ token=strtok(NULL," ");
+ }
+ xmlFree(values);
+ }
xmlFree(property_name);
}
--
Gitblit v1.9.3