From 819a098258db5b53d126720394644c909f5656a7 Mon Sep 17 00:00:00 2001
From: samo <samo.penic@gmail.com>
Date: Wed, 26 Apr 2017 12:53:15 +0000
Subject: [PATCH] Fixes for compilation on Ubuntu 17.04
---
src/timestep.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index 6972015..27400e7 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -49,22 +49,16 @@
fd2=fopen(filename,"w");
else
fd2=fopen(filename,"a");
- if(fd2==NULL){
- fatal("Cannot open ulm2.csv file for writing",1);
- }
- if(start_iteration==0) //file does not exist
- fprintf(fd2, "Timestep u_00^2 u_10^2 u_11^2 u_20^2 ...\n");
-
+ if(fd2==NULL){
+ fatal("Cannot open ulm2.csv file for writing",1);
+ }
+ if(start_iteration==0) //file does not exist
+ 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);
-/*Nir Gov: randomly add spontaneous curvature for some vertices */
- for(i=0;i<200;i++){
- int b=rand() % vesicle->vlist->n;
- vesicle->vlist->vtx[b]->c=-0.1;
- }
centermass(vesicle);
cell_occupation(vesicle);
vesicle_volume(vesicle); //needed for constant volume at this moment
@@ -74,7 +68,7 @@
ts_fprintf(stdout,"Setting volume V0=%.17f\n",V0);
if(A0<0.000001)
A0=vesicle->area;
- ts_fprintf(stdout,"Setting area A0=%.17f\n",A0);
+ ts_fprintf(stdout,"Setting area A0=%.17f\n",A0);
epsvol=4.0*sqrt(2.0*M_PI)/pow(3.0,3.0/4.0)*V0/pow(vesicle->tlist->n,3.0/2.0);
epsarea=A0/(ts_double)vesicle->tlist->n;
// fprintf(stderr, "DVol=%1.16f (%1.16f), V0=%1.16f\n", epsvol,0.003e-2*V0,V0);
@@ -98,7 +92,7 @@
cell_occupation(vesicle);
dump_state(vesicle,i);
if(i>=inititer){
- write_vertex_xml_file(vesicle,i-inititer);
+ write_vertex_xml_file(vesicle,i-inititer,NULL);
write_master_xml_file(command_line_args.output_fullfilename);
epochtime=get_epoch();
gyration_eigen(vesicle, &l1, &l2, &l3);
--
Gitblit v1.9.3