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 | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/restore.c b/src/restore.c index 6e12c1e..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; @@ -362,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