From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Wed, 04 May 2022 05:46:43 +0000 Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate --- src/tspoststat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tspoststat.c b/src/tspoststat.c index 6a4b8fb..c0b0175 100644 --- a/src/tspoststat.c +++ b/src/tspoststat.c @@ -29,7 +29,7 @@ #include<gsl/gsl_complex.h> #include<gsl/gsl_complex_math.h> #include<stdio.h> - +#include "globals.h" ts_vesicle *restoreVesicle(char *filename){ ts_vesicle *vesicle = parseDump(filename); return vesicle; @@ -105,11 +105,11 @@ ts_uint tstep,n; ts_char *number; struct dirent **list; - ts_double l1,l2,l3; + ts_double l1,l2,l3,hbar; int count; ts_fprintf(stderr,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__); - fprintf(stdout, "OuterLoop Volume Area lamdba1 lambda2 lambda3 Nbw/Nb\n"); + fprintf(stdout, "OuterLoop Volume Area lamdba1 lambda2 lambda3 Nbw/Nb hbar\n"); count=scandir(".",&list,0,alphasort); @@ -136,7 +136,8 @@ vesicle_volume(vesicle); vesicle_area(vesicle); gyration_eigen(vesicle,&l1,&l2,&l3); - fprintf(stdout,"%d %.17e %.17e %.17e %.17e %.17e %.17e\n",atoi(number),vesicle->volume, vesicle->area,l1,l2,l3, (ts_double)count_bonds_with_energy(vesicle->blist)/(ts_double)vesicle->blist->n), + hbar=vesicle_meancurvature(vesicle)/vesicle->area; + fprintf(stdout,"%d %.17e %.17e %.17e %.17e %.17e %.17e %.17e\n",atoi(number),vesicle->volume, vesicle->area,l1,l2,l3, (ts_double)count_bonds_with_energy(vesicle->blist)/(ts_double)vesicle->blist->n,hbar); tstep++; write_histogram_data(atoi(number), vesicle); free(number); -- Gitblit v1.9.3