Added resotration from vtu files by using --restore-from-vtk flag. Requires...

Samo Penic

2016-03-01 ab798b28b9f3b836db6c9eb9e4a25d57981022ae

Added resotration from vtu files by using --restore-from-vtk flag. Requires filename

 src/io.c

@@ -455,7 +455,7 @@
           {"dump-filename", required_argument,0, 'f'},
           {"tape-options",required_argument,0,'c'},
           {"tape-template", required_argument,0,0},
            {"dump-from-vtk",required_argument,0,0},
            {"restore-from-vtk",required_argument,0,0},
           {0, 0, 0, 0}
         };
       /* getopt_long stores the option index here. */
@@ -482,7 +482,7 @@
            if(strcmp(long_options[option_index].name,"tape-template")==0){
                strcpy(command_line_args.tape_templatefull,optarg);
            }
            if(strcmp(long_options[option_index].name,"dump-from-vtk")==0){
            if(strcmp(long_options[option_index].name,"restore-from-vtk")==0){
                strcpy(command_line_args.dump_from_vtk,optarg);
            }
           break;

 src/main.c

@@ -29,13 +29,17 @@
    force_from_tape=0;
    parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
    ts_fprintf(stdout,"Starting program...\n\n");
    parseDump("timestep_000000.vtu");
//    vesicle = parseDump("timestep_000000.vtu");
//        run_simulation(vesicle, vesicle->tape->mcsweeps, vesicle->tape->inititer, vesicle->tape->iterations, 1);

    if(command_line_args.dump_from_vtk[0]!=0){
        ts_fprintf(stdout,"************************************************\n");
        ts_fprintf(stdout,"***** Dumping vesicle from VTK points list *****\n");
        ts_fprintf(stdout,"************************************************\n\n");
        tape=parsetape(command_line_args.tape_fullfilename);
        vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
        vesicle = parseDump(command_line_args.dump_from_vtk);
        tape = vesicle->tape;
//        tape=parsetape(command_line_args.tape_fullfilename);
  //      vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
    }
    else if(command_line_args.force_from_tape){
        ts_fprintf(stdout,"************************************************\n");

 src/restore.c

@@ -16,7 +16,7 @@
#include "initial_distribution.h"
#include "io.h"

ts_bool parseDump(char *dumpfname) {
ts_vesicle *parseDump(char *dumpfname) {
    xmlDocPtr doc;
    xmlNodePtr cur, cur1,cur2;
    ts_vesicle *vesicle=NULL;
@@ -80,13 +80,13 @@
    init_normal_vectors(vesicle->tlist);
    mean_curvature_and_energy(vesicle);

/* TODO: cells, polymeres, filaments, core, tape */
/* TODO: filaments */

    fprintf(stderr,"Restoration completed\n");
    write_vertex_xml_file(vesicle,999);
    vesicle_free(vesicle);
    exit(0);
    return TS_SUCCESS;
//    write_vertex_xml_file(vesicle,999);
//    vesicle_free(vesicle);
//    exit(0);
    return vesicle;
}

ts_bool setGlobalTapeTXTfromTapeTag(xmlDocPtr doc, xmlNodePtr cur){

 src/restore.h

@@ -1,7 +1,7 @@
#ifndef _H_RESTORE
#define _H_RESTORE

ts_bool parseDump(char *dumpfname);
ts_vesicle *parseDump(char *dumpfname);
ts_vesicle *parseTrisurfTag(xmlDocPtr doc, xmlNodePtr cur);
ts_bool setGlobalTapeTXTfromTapeTag(xmlDocPtr doc, xmlNodePtr cur);
ts_bool parseTrisurfVtxn(ts_vertex_list *vlist, xmlDocPtr doc, xmlNodePtr cur);