From 6c274defd904dedd6cb89c002f5eeced6c079d47 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 11 Dec 2018 11:42:22 +0000
Subject: [PATCH] Added stretching variables
---
src/general.h | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/general.h b/src/general.h
index 5189c23..c530a68 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;
@@ -249,6 +250,11 @@
typedef struct ts_poly_list ts_poly_list;
+typedef struct{
+ ts_float z_max;
+ ts_float z_min;
+ ts_int force_switch;
+} ts_confinement_plane;
typedef struct {
long int nshell;
@@ -257,6 +263,7 @@
long int nczmax;
long int npoly;
long int nmono;
+ long int internal_poly;
long int nfil;
long int nfono;
long int R_nucleus;
@@ -283,6 +290,13 @@
long int mcsweeps;
long int quiet;
long int shc;
+ 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;
@@ -308,22 +322,25 @@
ts_double spring_constant;
ts_double pressure;
ts_int pswitch;
- ts_tape *tape;
+ 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_double area;
+ ts_confinement_plane confinement_plane;
} ts_vesicle;
-typedef struct{
+struct ts_cluster{
ts_uint nvtx;
ts_uint idx;
ts_vertex **vtx;
-} ts_cluster;
+};
+
+typedef struct ts_cluster ts_cluster;
typedef struct{
ts_uint n;
@@ -365,4 +382,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