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 | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/general.h b/src/general.h
index 5194460..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
@@ -164,12 +163,14 @@
} ts_vertex_list;
struct ts_bond {
- ts_uint idx;
+ 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;
@@ -230,6 +231,7 @@
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_vertex *grafted_vtx;
+ ts_double k;
};
typedef struct ts_poly ts_poly;
@@ -247,17 +249,26 @@
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_triangle_list *tlist;
- ts_cell_list *clist;
+ ts_cell_list *clist;
ts_uint nshell;
- ts_double bending_rigidity;
- ts_double dmax;
- ts_double stepsize;
- ts_double cm[3];
- ts_double volume;
- ts_spharm *sphHarmonics;
+ ts_double bending_rigidity;
+ ts_double dmax;
+ ts_double stepsize;
+ 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_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