From e6efc61995516174081e923004477e3ff0853515 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 19 Sep 2017 12:35:28 +0000
Subject: [PATCH] Added comments for spontaneous curvature in energy.c and tape

---
 src/general.h |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/src/general.h b/src/general.h
index 393eafe..a0e31a5 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;
 
@@ -256,9 +258,13 @@
 	long int nczmax;
 	long int npoly;
 	long int nmono;
+	long int internal_poly;
 	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;
@@ -279,6 +285,10 @@
 	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;
 } ts_tape;
 
 
@@ -306,9 +316,27 @@
 	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 */
@@ -338,4 +366,12 @@
 #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);
+char *libVersion();
 #endif

--
Gitblit v1.9.3