From 6487a03362d35589c286d0660eba123a7ab00535 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 10 May 2021 11:14:04 +0000
Subject: [PATCH] Raj and Yoav session in making multiple protein species

---
 src/general.h |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/general.h b/src/general.h
index 9a8feab..d131ca6 100644
--- a/src/general.h
+++ b/src/general.h
@@ -158,6 +158,7 @@
         ts_double solAngle;
 		struct ts_poly *grafted_poly;
 		struct ts_cluster *cluster;
+	ts_double direct_interaction_force;
 };
 typedef struct ts_vertex ts_vertex;
 
@@ -201,6 +202,7 @@
 
 struct ts_triangle_list{
     ts_uint n;
+	ts_double a0;
     ts_triangle **tria;
 };
 typedef struct ts_triangle_list ts_triangle_list;
@@ -218,7 +220,7 @@
     ts_cell **cell;
     ts_double dcell;
     ts_double shift;
-    ts_double max_occupancy;
+    ts_uint max_occupancy;
 	ts_double dmin_interspecies;
 } ts_cell_list;
 
@@ -251,6 +253,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;
@@ -292,6 +299,9 @@
 	ts_double c0;
 	ts_double w;
 	ts_double F;
+	long int plane_confinement_switch;
+	ts_double plane_d;
+	ts_double plane_F;
 } ts_tape;
 
 
@@ -317,13 +327,14 @@
 	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;
 
 

--
Gitblit v1.9.3