From 22cdfdcca0212df64e3352a834bbacda5686d732 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 24 Apr 2014 16:26:12 +0000
Subject: [PATCH] added 3 different calculations for Kc
---
src/timestep.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index d5fd583..c0a8ef1 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -15,7 +15,7 @@
ts_bool run_simulation(ts_vesicle *vesicle, ts_uint mcsweeps, ts_uint inititer, ts_uint iterations, ts_uint start_iteration){
ts_uint i, j,k;
- ts_double r0,kc;
+ ts_double r0,kc1,kc2,kc3;
ts_double l1,l2,l3,volume=0.0,area=0.0,vmsr,bfsr, vmsrt, bfsrt;
ts_ulong epochtime;
FILE *fd1;
@@ -24,7 +24,7 @@
if(fd==NULL){
fatal("Cannot open statistics.csv file for writing",1);
}
- fprintf(fd, "Epoch OuterLoop VertexMoveSucessRate BondFlipSuccessRate Volume Area lamdba1 lambda2 lambda3 Kc\n");
+ fprintf(fd, "Epoch OuterLoop VertexMoveSucessRate BondFlipSuccessRate Volume Area lamdba1 lambda2 lambda3 Kc(2-9) Kc(6-9) Kc(2-end)\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);
@@ -56,7 +56,10 @@
calculateUlmComplex(vesicle);
storeUlmComplex2(vesicle);
saveAvgUlm2(vesicle);
- kc=calculateKc(vesicle);
+ kc1=calculateKc(vesicle, 2,9);
+ kc2=calculateKc(vesicle, 6,9);
+ kc3=calculateKc(vesicle, 2,vesicle->sphHarmonics->l);
+
fd1=fopen("state.dat","w");
fprintf(fd1,"%e %e\n",vesicle->volume, getR0(vesicle));
for(k=0;k<vesicle->vlist->n;k++){
@@ -71,7 +74,7 @@
fclose(fd1);
}
- fprintf(fd, "%lu %u %e %e %1.16e %1.16e %1.16e %1.16e %1.16e %1.16e\n",epochtime,i,vmsr,bfsr,volume, area,l1,l2,l3,kc);
+ fprintf(fd, "%lu %u %e %e %1.16e %1.16e %1.16e %1.16e %1.16e %1.16e %1.16e %1.16e\n",epochtime,i,vmsr,bfsr,volume, area,l1,l2,l3,kc1, kc2, kc3);
fflush(fd);
// sprintf(filename,"timestep-%05d.pov",i-inititer);
// write_pov_file(vesicle,filename);
--
Gitblit v1.9.3