From 324ad7bb72e435d61bc25d076d9253d769903d33 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 Jun 2014 20:46:09 +0000
Subject: [PATCH] Cahnged line join on the end of the line
---
src/timestep.c | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index a57687a..bdd2e2a 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -12,19 +12,38 @@
#include "sh.h"
#include "shcomplex.h"
#include "vesicle.h"
+#include<gsl/gsl_complex.h>
+#include<gsl/gsl_complex_math.h>
+#include "cross-section.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,k;
+ ts_uint i, j,k,l,m;
ts_double r0,kc1,kc2,kc3,kc4;
ts_double l1,l2,l3,volume=0.0,area=0.0,vmsr,bfsr, vmsrt, bfsrt;
ts_ulong epochtime;
- FILE *fd1;
+ FILE *fd1,*fd2=NULL;
// char filename[255];
FILE *fd=fopen("statistics.csv","w");
+
+ ts_coord_list *pts;
if(fd==NULL){
fatal("Cannot open statistics.csv file for writing",1);
}
fprintf(fd, "Epoch OuterLoop VertexMoveSucessRate BondFlipSuccessRate Volume Area lamdba1 lambda2 lambda3 Kc(2-9) Kc(6-9) Kc(2-end) Kc(3-6)\n");
+
+ if(vesicle->sphHarmonics!=NULL){
+ fd2=fopen("ulm2.csv","w");
+ if(fd2==NULL){
+ fatal("Cannot open ulm2.csv file for writing",1);
+ }
+ fprintf(fd2, "Timestep u_00^2 u_10^2 u_11^2 u_20^2 ...\n");
+
+ }
+
+/* RANDOM SEED SET BY CURRENT TIME */
+ epochtime=get_epoch();
+ srand48(epochtime);
+
centermass(vesicle);
cell_occupation(vesicle);
vesicle_volume(vesicle); //needed for constant volume at this moment
@@ -51,12 +70,16 @@
if(i>=inititer){
write_vertex_xml_file(vesicle,i-inititer);
write_master_xml_file("test.pvd");
- epochtime=get_epoch();
+ epochtime=get_epoch();
gyration_eigen(vesicle, &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){
+ pts=get_crossection_with_plane(vesicle, 0.0,0.0,1.0,0.0);
+ save_crossection_snapshot(pts,i-inititer);
+ free(pts);
+
preparationSh(vesicle,r0);
//calculateYlmi(vesicle);
calculateUlmComplex(vesicle);
@@ -79,15 +102,28 @@
);
}
fclose(fd1);
+
+ fprintf(fd2,"%u ", i);
+ for(l=0;l<vesicle->sphHarmonics->l;l++){
+ for(m=l;m<2*l+1;m++){
+ fprintf(fd2,"%e ", gsl_complex_abs2(vesicle->sphHarmonics->ulmComplex[l][m]) );
+ }
+ }
+ fprintf(fd2,"\n");
+
+ fflush(fd2);
+
}
fprintf(fd, "%lu %u %e %e %1.16e %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,kc4);
+
fflush(fd);
// sprintf(filename,"timestep-%05d.pov",i-inititer);
// write_pov_file(vesicle,filename);
}
}
fclose(fd);
+ if(fd2!=NULL) fclose(fd2);
return TS_SUCCESS;
}
--
Gitblit v1.9.3