From cc95bd1ca5e69ce13766ca0acea11560531ed620 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@fe.uni-lj.si> Date: Tue, 24 May 2016 08:01:55 +0000 Subject: [PATCH] From snapshots, raw tape configuration is extracted and written into tape file and not the rendered one --- src/general.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 4 deletions(-) diff --git a/src/general.h b/src/general.h index 8165505..dccee34 100644 --- a/src/general.h +++ b/src/general.h @@ -1,3 +1,4 @@ +/* vim: set ts=4 sts=4 sw=4 noet : */ #ifndef _GENERAL_H #define _GENERAL_H @@ -249,6 +250,43 @@ +typedef struct { + long int nshell; + long int ncxmax; + long int ncymax; + long int nczmax; + long int npoly; + long int nmono; + long int nfil; + long int nfono; + long int R_nucleus; + ts_double R_nucleusX; + ts_double R_nucleusY; + ts_double R_nucleusZ; + long int pswitch; + long int constvolswitch; + long int constareaswitch; + ts_double constvolprecision; + char *multiprocessing; + long int brezveze0; + long int brezveze1; + long int brezveze2; + ts_double xk0; + ts_double dmax; + ts_double dmin_interspecies; + ts_double stepsize; + ts_double kspring; + ts_double xi; + ts_double pressure; + long int iterations; + long int inititer; + long int mcsweeps; + long int quiet; + long int shc; +} ts_tape; + + + typedef struct { ts_vertex_list *vlist; @@ -270,9 +308,12 @@ ts_double spring_constant; ts_double pressure; ts_int pswitch; - + ts_tape *tape; ts_double R_nucleus; - + ts_double R_nucleusX; + ts_double R_nucleusY; + ts_double R_nucleusZ; + ts_double area; } ts_vesicle; @@ -280,8 +321,10 @@ /* GLOBAL VARIABLES */ int quiet; - - +ts_double V0; +ts_double A0; +ts_double epsvol; +ts_double epsarea; /* FUNCTIONS */ /** Non-fatal error function handler: @@ -302,4 +345,11 @@ #define VTX(n) &(vlist->vtx[n]) #define VTX_DATA(n) vlist->vtx[n].data + +/* FOR PID GENERATION ROUTINE */ +#define CPF_CLOEXEC 1 + +int createPidFile(const char *progName, const char *pidFile, int flags); + +int lockRegion(int fd, int type, int whence, int start, int len); #endif -- Gitblit v1.9.3