From 301c87b8a0ae31d97adf840d90dd241ffb3328b6 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Tue, 24 May 2016 17:02:48 +0000 Subject: [PATCH] A fix in restoring from snapshot when filaments are used --- src/general.h | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/general.h b/src/general.h index 3238245..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 @@ -259,8 +260,12 @@ 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; @@ -305,7 +310,10 @@ 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; @@ -313,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: @@ -335,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