From ac9826b40021798ad3c207f526f64950bc293fb2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 01 Jun 2016 15:56:32 +0000
Subject: [PATCH] Statistics.csv and ulm2.dat are being appended if simulations are restarting
---
src/timestep.c | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 9f30dda..df74c43 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -16,30 +16,44 @@
#include<gsl/gsl_complex.h>
#include<gsl/gsl_complex_math.h>
#include<string.h>
+#include <sys/stat.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,l,m;
ts_double r0,kc1=0,kc2=0,kc3=0,kc4=0;
ts_double l1,l2,l3,vmsr,bfsr, vmsrt, bfsrt;
ts_ulong epochtime;
- FILE *fd1,*fd2=NULL;
+ FILE *fd1,*fd2=NULL,*fd3=NULL;
char filename[10000];
- strcpy(filename,command_line_args.path);
- strcat(filename,"statistics.csv");
- FILE *fd=fopen(filename,"w");
+ //struct stat st;
+ strcpy(filename,command_line_args.path);
+ strcat(filename,"statistics.csv");
+ //int result = stat(filename, &st);
+ FILE *fd;
+ if(start_iteration==0)
+ fd=fopen(filename,"w");
+ else
+ fd=fopen(filename,"a");
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(start_iteration==0)
+ 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){
strcpy(filename,command_line_args.path);
strcat(filename,"ulm2.csv");
+// int result = stat(filename, &st);
+ if(start_iteration==0)
fd2=fopen(filename,"w");
+ else
+ fd2=fopen(filename,"a");
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");
+ if(start_iteration==0) //file does not exist
+ fprintf(fd2, "Timestep u_00^2 u_10^2 u_11^2 u_20^2 ...\n");
}
@@ -76,6 +90,12 @@
cell_occupation(vesicle);
ts_fprintf(stdout,"Done %d out of %d iterations (x %d MC sweeps).\n",i+1,inititer+iterations,mcsweeps);
dump_state(vesicle,i);
+ fd3=fopen(".status","w");
+ if(fd3==NULL){
+ fatal("Cannot open .status file for writing",1);
+ }
+ fprintf(fd3,"%d",i);
+ fclose(fd3);
if(i>=inititer){
write_vertex_xml_file(vesicle,i-inititer);
write_master_xml_file(command_line_args.output_fullfilename);
--
Gitblit v1.9.3