From f06f5f9ad1e42a10d6a9367513e66c0c06295de2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 23 Apr 2014 12:18:03 +0000
Subject: [PATCH] Calculating Kc. Needs debugging.
---
src/timestep.c | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index b7857dd..415be74 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -10,13 +10,15 @@
#include "io.h"
#include "stats.h"
#include "sh.h"
+#include "shcomplex.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_uint i, j,k;
ts_double r0;
ts_double l1,l2,l3,volume=0.0,area=0.0,vmsr,bfsr, vmsrt, bfsrt;
ts_ulong epochtime;
+ FILE *fd1;
// char filename[255];
FILE *fd=fopen("statistics.csv","w");
if(fd==NULL){
@@ -50,10 +52,23 @@
r0=getR0(vesicle);
if(vesicle->sphHarmonics!=NULL){
preparationSh(vesicle,r0);
- calculateYlmi(vesicle);
- calculateUlm(vesicle);
- storeUlm2(vesicle);
+ //calculateYlmi(vesicle);
+ calculateUlmComplex(vesicle);
+ storeUlmComplex2(vesicle);
saveAvgUlm2(vesicle);
+ calculateKc(vesicle);
+ fd1=fopen("state.dat","w");
+ fprintf(fd1,"%e %e\n",vesicle->volume, getR0(vesicle));
+ for(k=0;k<vesicle->vlist->n;k++){
+ fprintf(fd1,"%e %e %e %e %e\n",
+ vesicle->vlist->vtx[k]->x,
+ vesicle->vlist->vtx[k]->y,
+ vesicle->vlist->vtx[k]->z,
+ vesicle->vlist->vtx[k]->solAngle,
+ vesicle->vlist->vtx[k]->relR
+ );
+ }
+ fclose(fd1);
}
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);
--
Gitblit v1.9.3