Trisurf Monte Carlo simulator
Samo Penic
2016-02-29 bb40336eb8a2acc9f2e3d2e9059b7d90afe5c0c4
Some leaks still present in xml parsing library.
1 files modified
12 ■■■■ changed files
src/restore.c 12 ●●●● patch | view | raw | blame | history
src/restore.c
@@ -12,6 +12,7 @@
#include "triangle.h"
#include "bond.h"
#include "energy.h"
#include "poly.h"
#include "initial_distribution.h"
ts_bool parseDump(char *dumpfname) {
@@ -68,13 +69,16 @@
    }
    
    xmlFreeDoc(doc);
    vesicle->poly_list=init_poly_list(0, 0, vesicle->vlist, vesicle);
    init_normal_vectors(vesicle->tlist);
    mean_curvature_and_energy(vesicle);
/* TODO: cells, polymeres, filaments, core, tape */
    fprintf(stderr,"Restoration completed\n");
    write_vertex_xml_file(vesicle,999);
//    write_vertex_xml_file(vesicle,999);
    vesicle_free(vesicle);
    exit(0);
    return TS_SUCCESS;
@@ -294,12 +298,13 @@
}
ts_bool parseXMLBonds(ts_vesicle *vesicle,xmlDocPtr doc, xmlNodePtr cur){
    xmlNodePtr child = cur->xmlChildrenNode;
    xmlChar *bonds;
    xmlChar *bonds, *conname;
    char *b;
    int idx;
    char *token[2];
    while (child != NULL) {
        if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(xmlGetProp(child, (xmlChar *)"Name"), (const xmlChar *)"connectivity") ){
        conname=xmlGetProp(child, (xmlChar *)"Name");
        if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray")) && !xmlStrcmp(conname, (const xmlChar *)"connectivity") ){
            bonds = xmlNodeListGetString(doc, child->xmlChildrenNode, 1);
            b=(char *)bonds;
            token[0]=strtok(b," ");
@@ -313,6 +318,7 @@
            }
            xmlFree(bonds);
        }
        xmlFree(conname);
        child=child->next;
    }
    fprintf(stderr,"Bond data j=%d\n",idx);