From 267cf14b1ced6fce480e4292131a987a1802e28a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 23 Sep 2018 08:32:24 +0000
Subject: [PATCH] Confinement planes, not debugged
---
src/general.h | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/general.h b/src/general.h
index 31de50a..503486f 100644
--- a/src/general.h
+++ b/src/general.h
@@ -156,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;
@@ -257,6 +258,7 @@
long int nczmax;
long int npoly;
long int nmono;
+ long int internal_poly;
long int nfil;
long int nfono;
long int R_nucleus;
@@ -286,8 +288,16 @@
long int number_of_vertices_with_c0;
ts_double c0;
ts_double w;
+ ts_double F;
+ long int plane_confinement_switch;
+ ts_double plane_d;
+ ts_double plane_F;
} ts_tape;
+typedef struct{
+ ts_float z_max;
+ ts_float z_min;
+} ts_confinement_plane;
@@ -317,8 +327,25 @@
ts_double R_nucleusY;
ts_double R_nucleusZ;
ts_double nucleus_center[3];
- ts_double area;
+ ts_double area;
+ ts_confinement_plane confinement_plane;
} 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;
+
@@ -356,4 +383,5 @@
int createPidFile(const char *progName, const char *pidFile, int flags);
int lockRegion(int fd, int type, int whence, int start, int len);
+char *libVersion();
#endif
--
Gitblit v1.9.3