From ab798b28b9f3b836db6c9eb9e4a25d57981022ae Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 01 Mar 2016 08:51:46 +0000
Subject: [PATCH] Added resotration from vtu files by using --restore-from-vtk flag. Requires filename
---
src/main.c | 10 +++++++---
src/io.c | 4 ++--
src/restore.h | 2 +-
src/restore.c | 12 ++++++------
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/io.c b/src/io.c
index 0a6cd57..8e97a8f 100644
--- a/src/io.c
+++ b/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;
diff --git a/src/main.c b/src/main.c
index 3407c65..8cd8321 100644
--- a/src/main.c
+++ b/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");
diff --git a/src/restore.c b/src/restore.c
index a3196bd..19d8cad 100644
--- a/src/restore.c
+++ b/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){
diff --git a/src/restore.h b/src/restore.h
index 4c97a09..84c8747 100644
--- a/src/restore.h
+++ b/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);
--
Gitblit v1.9.3