From 698ae18f535c3e388b6ebcdca1582005a29ff2f2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 29 Feb 2016 11:52:16 +0000
Subject: [PATCH] Tape is in the dump and successfully restored.
---
src/snapshot.c | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/snapshot.c b/src/snapshot.c
index f279dd0..177557d 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -7,7 +7,8 @@
#include<inttypes.h>
#include<config.h>
#include <time.h>
-
+#include "io.h"
+/* a helper function that utilizes ts_string data structure and performs same as sprintf */
ts_uint ts_sprintf(ts_string *str, char *fmt, ...){
va_list ap;
va_start(ap,fmt);
@@ -17,7 +18,7 @@
return n;
}
-
+/* outputs additional data into paraview xml file */
ts_bool xml_trisurf_data(FILE *fh, ts_vesicle *vesicle){
ts_string *data=(ts_string *)malloc(sizeof(ts_sprintf));
@@ -37,7 +38,7 @@
#else
fprintf(fh,"%s", data->string);
#endif
- free(data->string);
+ free(data->string); /* TODO: valgrind is not ok with this! */
free(data);
xml_trisurf_footer(fh);
return TS_SUCCESS;
@@ -49,15 +50,26 @@
char *c_time_string;
current_time = time(NULL);
c_time_string = ctime(¤t_time);
-
+ int npoly, nfono;
+
fprintf(fh, "<trisurfversion>Trisurf (commit %s), compiled on %s %s</trisurfversion>\n",TS_VERSION, __DATE__, __TIME__);
fprintf(fh, "<dumpdate>%s</dumpdate>\n", c_time_string);
- //free (c_time_string);
fprintf(fh, "<tape>\n");
-
+ fprintf(fh,"%s",tapetxt);
fprintf(fh, "</tape>\n");
- fprintf(fh, "<trisurf nvtx=\"%u\" npoly=\"%u\" nfono=\"%u\">\n", vesicle->vlist->n, vesicle->poly_list->n, vesicle->poly_list->poly[0]->vlist->n);
+ if(vesicle->poly_list!=NULL){
+ npoly=vesicle->poly_list->n;
+ if(npoly!=0){
+ nfono=vesicle->poly_list->poly[0]->vlist->n;
+ } else {
+ nfono=0;
+ }
+ } else {
+ npoly=0;
+ nfono=0;
+ }
+ fprintf(fh, "<trisurf nvtx=\"%u\" npoly=\"%u\" nfono=\"%u\" compressed=\"false\">\n", vesicle->vlist->n, npoly, nfono);
return TS_SUCCESS;
}
@@ -70,7 +82,7 @@
ts_uint i;
ts_sprintf(data,"<tria>");
for(i=0; i<tlist->n;i++){
- ts_sprintf(data,"%u %u %u",tlist->tria[i]->vertex[0]->idx, tlist->tria[i]->vertex[1]->idx, tlist->tria[i]->vertex[2]->idx);
+ ts_sprintf(data,"%u %u %u ",tlist->tria[i]->vertex[0]->idx, tlist->tria[i]->vertex[1]->idx, tlist->tria[i]->vertex[2]->idx);
}
ts_sprintf(data,"</tria>");
return TS_SUCCESS;
@@ -80,7 +92,7 @@
ts_uint i;
ts_sprintf(data,"<trianeigh>\n");
for(i=0; i<tlist->n;i++){
- ts_sprintf(data,"%u %u %u",tlist->tria[i]->neigh[0]->idx, tlist->tria[i]->neigh[1]->idx, tlist->tria[i]->neigh[2]->idx);
+ ts_sprintf(data,"%u %u %u ",tlist->tria[i]->neigh[0]->idx, tlist->tria[i]->neigh[1]->idx, tlist->tria[i]->neigh[2]->idx);
}
ts_sprintf(data,"</trianeigh>\n");
return TS_SUCCESS;
--
Gitblit v1.9.3