From 1153c110781fc3add2c22ab2d996e05b0e0b10de Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 11:56:00 +0000
Subject: [PATCH] Merged branches polyel with constant volume

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

diff --git a/src/general.h b/src/general.h
index 0372e7a..2999090 100644
--- a/src/general.h
+++ b/src/general.h
@@ -164,12 +164,13 @@
 } 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 energy;
 };
 typedef struct ts_bond ts_bond;
 
@@ -259,6 +260,8 @@
 
 	ts_poly_list *poly_list;
 	ts_double spring_constant;
+	ts_double pressure;
+	ts_int pswitch;
 } ts_vesicle;
 
 

--
Gitblit v1.9.3