From ff8152b46e7957beffeafca580abc90df47d9d28 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 21 Mar 2014 21:15:31 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'
---
src/general.h | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/general.h b/src/general.h
index e7e9545..79da2ba 100644
--- a/src/general.h
+++ b/src/general.h
@@ -3,7 +3,6 @@
#include<stdarg.h>
#include<stdio.h>
-
/* @brief This is a header file, defining general constants and structures.
* @file header.h
* @author Samo Penic
@@ -167,10 +166,11 @@
ts_uint idx;
ts_vertex *vtx1;
ts_vertex *vtx2;
- ts_double bond_length;
- ts_double bond_length_dual;
- ts_bool tainted;
+ ts_double bond_length;
+ ts_double bond_length_dual;
+ ts_bool tainted; //TODO: remove
ts_double energy;
+ ts_double x,y,z;
};
typedef struct ts_bond ts_bond;
@@ -257,11 +257,18 @@
ts_double cm[3];
ts_double volume;
ts_spharm *sphHarmonics;
-
+// Polymers outside the vesicle and attached to the vesicle membrane (polymer brush):
ts_poly_list *poly_list;
- ts_double spring_constant;
-} ts_vesicle;
+// Filaments inside the vesicle (not attached to the vesicel membrane:
+ ts_poly_list *filament_list;
+ ts_double spring_constant;
+ ts_double pressure;
+ ts_int pswitch;
+
+ ts_double R_nucleus;
+
+} ts_vesicle;
--
Gitblit v1.9.3