From cb2faf7217a026ad114935c1fd71c96240c30055 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sun, 19 Feb 2017 15:56:14 +0000 Subject: [PATCH] Added library version checking --- src/snapshot.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/snapshot.c b/src/snapshot.c index 370ce4c..da21498 100644 --- a/src/snapshot.c +++ b/src/snapshot.c @@ -24,7 +24,7 @@ ts_bool xml_trisurf_data(FILE *fh, ts_vesicle *vesicle){ ts_string *data=(ts_string *)malloc(sizeof(ts_sprintf)); - data->string=(char *)malloc(512000*sizeof(char)); /*TODO: warning, can break if the string is to long */ + data->string=(char *)malloc(5120000*sizeof(char)); /*TODO: warning, can break if the string is to long */ data->beg=0; xml_trisurf_header(fh, vesicle); @@ -32,6 +32,8 @@ xml_trisurf_tria_neigh(data,vesicle->tlist); xml_trisurf_vtx_neigh(data,vesicle->vlist); xml_trisurf_vtx_tristar(data,vesicle->vlist); + xml_trisurf_nucleus(data,vesicle); + xml_trisurf_constvolarea(data,V0,A0); #ifdef COMPRESSION char *compressed; ts_uint nbytes=ts_compress_string64(data->string, data->beg-1, &compressed); //suppress null character at the end with by substracting 1 @@ -57,7 +59,7 @@ 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); - fprintf(fh, "<tape>\n"); + fprintf(fh, "<tape>"); fprintf(fh,"%s",tapetxt); fprintf(fh, "</tape>\n"); if(vesicle->poly_list!=NULL){ @@ -124,7 +126,18 @@ return TS_SUCCESS; } +ts_bool xml_trisurf_nucleus(ts_string *data, ts_vesicle* vesicle){ + if(vesicle->R_nucleus>0.0 || (vesicle->R_nucleusX>0.0 && vesicle->R_nucleusY>0.0 && vesicle->R_nucleusZ>0.0)){ + ts_sprintf(data,"<nucleus>%.17e %.17e %.17e</nucleus>",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]); + } + return TS_SUCCESS; +} +ts_bool xml_trisurf_constvolarea(ts_string *data, ts_double volume, ts_double area){ + ts_sprintf(data,"<constant_volume>%.17e</constant_volume>",volume); + ts_sprintf(data,"<constant_area>%.17e</constant_area>",area); + return TS_SUCCESS; +} /* UTILITIES */ -- Gitblit v1.9.3