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 | 13 ++++++------- src/io.c | 5 +++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/io.c b/src/io.c index 21c8f1d..65a426b 100644 --- a/src/io.c +++ b/src/io.c @@ -1,3 +1,4 @@ + /* vim: set ts=4 sts=4 sw=4 noet : */ #include "general.h" #include<stdio.h> @@ -1174,8 +1175,8 @@ CFG_SIMPLE_INT("iterations",&tape->iterations), CFG_SIMPLE_INT("mcsweeps",&tape->mcsweeps), CFG_SIMPLE_INT("inititer", &tape->inititer), - CFG_SIMPLE_BOOL("quiet",&tape->quiet), - CFG_SIMPLE_STR("multiprocessing",tape->multiprocessing), + CFG_SIMPLE_BOOL("quiet",(cfg_bool_t *)&tape->quiet), + CFG_SIMPLE_STR("multiprocessing",&tape->multiprocessing), CFG_SIMPLE_INT("smp_cores",&tape->brezveze0), CFG_SIMPLE_INT("cluster_nodes",&tape->brezveze1), CFG_SIMPLE_INT("distributed_processes",&tape->brezveze2), diff --git a/src/timestep.c b/src/timestep.c index f7cb5dd..27400e7 100644 --- a/src/timestep.c +++ b/src/timestep.c @@ -49,12 +49,11 @@ 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 */ @@ -69,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); -- Gitblit v1.9.3