From c37ddc02423f806716dcbe6403d9d9d03f5668eb Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 04 Jul 2016 18:35:35 +0000
Subject: [PATCH] Small addition, not sure if it is necessary
---
src/general.h | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/general.h b/src/general.h
index e35310b..74293de 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
@@ -155,7 +156,8 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
- struct ts_poly *grafted_poly;
+ struct ts_poly *grafted_poly;
+ struct ts_cluster *cluster;
};
typedef struct ts_vertex ts_vertex;
@@ -259,8 +261,13 @@
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;
@@ -304,16 +311,36 @@
ts_int pswitch;
ts_tape *tape;
ts_double R_nucleus;
-
+ ts_double R_nucleusX;
+ ts_double R_nucleusY;
+ ts_double R_nucleusZ;
+ ts_double nucleus_center[3];
+ ts_double area;
} ts_vesicle;
+
+
+struct ts_cluster{
+ ts_uint nvtx;
+ ts_uint idx;
+ ts_vertex **vtx;
+};
+
+typedef struct ts_cluster ts_cluster;
+
+typedef struct{
+ ts_uint n;
+ ts_cluster **cluster;
+} ts_cluster_list;
/* GLOBAL VARIABLES */
int quiet;
-
-
+ts_double V0;
+ts_double A0;
+ts_double epsvol;
+ts_double epsarea;
/* FUNCTIONS */
/** Non-fatal error function handler:
@@ -334,4 +361,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