From 6da644f98434d3eac8b4e19981754f6030a315a5 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Jun 2018 12:05:32 +0000
Subject: [PATCH] Resolving the issues with restoring vesicles from vtu and fixing the volume. Dump to vtu has been repaired.
---
src/snapshot.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/snapshot.c b/src/snapshot.c
index 8b71e83..6c628b4 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -22,9 +22,9 @@
/* outputs additional data into paraview xml file */
ts_bool xml_trisurf_data(FILE *fh, ts_vesicle *vesicle){
-
+ ts_double cvol_write=0, carea_write=0;
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);
@@ -33,6 +33,15 @@
xml_trisurf_vtx_neigh(data,vesicle->vlist);
xml_trisurf_vtx_tristar(data,vesicle->vlist);
xml_trisurf_nucleus(data,vesicle);
+ if(vesicle->tape->constvolswitch==0)
+ cvol_write=vesicle->volume;
+ else
+ cvol_write=V0;
+ if(vesicle->tape->constareaswitch==0)
+ carea_write=vesicle->area;
+ else
+ carea_write=A0;
+ xml_trisurf_constvolarea(data,cvol_write,carea_write);
#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
@@ -127,10 +136,16 @@
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 %.7e</nucleus>",vesicle->nucleus_center[0], vesicle->nucleus_center[1], vesicle->nucleus_center[2]);
+ 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