From 091f7d56b288b83a32a2f7286ce532e5471ed49b Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 11 Apr 2014 08:10:45 +0000
Subject: [PATCH] Merge branch 'trout-rbc' of https://bitbucket.org/samop/trisurf-ng into trout-rbc
---
src/timestep.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 9ab60fd..b7857dd 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -9,9 +9,12 @@
#include "frame.h"
#include "io.h"
#include "stats.h"
+#include "sh.h"
+#include "vesicle.h"
ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_iteration){
ts_uint i, j;
+ ts_double r0;
ts_double l1,l2,l3,volume=0.0,area=0.0,vmsr,bfsr, vmsrt, bfsrt;
ts_ulong epochtime;
// char filename[255];
@@ -19,7 +22,7 @@
if(fd==NULL){
fatal("Cannot open statistics.csv file for writing",1);
}
- fprintf(fd, "Epoch OuterLoop VertexMoveSucessRate BondFlipSuccessRate Volume Area lamdba1 lambda2 lmabda3\n");
+ fprintf(fd, "Epoch OuterLoop VertexMoveSucessRate BondFlipSuccessRate Volume Area lamdba1 lambda2 lambda3\n");
centermass(vesicle);
cell_occupation(vesicle);
if(start_iteration<inititer) ts_fprintf(stdout, "Starting simulation (first %d x %d MC sweeps will not be recorded on disk)\n", inititer, mcsweeps);
@@ -42,9 +45,19 @@
write_master_xml_file("test.pvd");
epochtime=get_epoch();
gyration_eigen(vesicle, &l1, &l2, &l3);
- get_area_volume(vesicle, &area,&volume);
- fprintf(fd, "%lu %u %e %e %e %e %e %e %e\n",epochtime,i,vmsr,bfsr,volume, area,l1,l2,l3);
-
+ vesicle_volume(vesicle); //calculates just volume. Area is not added to ts_vesicle yet!
+ get_area_volume(vesicle, &area,&volume); //that's why I must recalculate area (and volume for no particular reason).
+ r0=getR0(vesicle);
+ if(vesicle->sphHarmonics!=NULL){
+ preparationSh(vesicle,r0);
+ calculateYlmi(vesicle);
+ calculateUlm(vesicle);
+ storeUlm2(vesicle);
+ saveAvgUlm2(vesicle);
+ }
+
+ fprintf(fd, "%lu %u %e %e %1.16e %1.16e %1.16e %1.16e %1.16e\n",epochtime,i,vmsr,bfsr,volume, area,l1,l2,l3);
+ fflush(fd);
// sprintf(filename,"timestep-%05d.pov",i-inititer);
// write_pov_file(vesicle,filename);
}
--
Gitblit v1.9.3