From 719c9febac2eaff9483fda487b57684afbb59bb2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 05 Mar 2014 16:47:50 +0000
Subject: [PATCH] dont know
---
src/general.h | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/general.h b/src/general.h
index 03dcc1d..643aab1 100644
--- a/src/general.h
+++ b/src/general.h
@@ -8,10 +8,11 @@
* @file header.h
* @author Samo Penic
* @date 5.3.2001
- *
+ *
* Header file for general inclusion in all the code, defining data structures
* and general constans. All datatypes used in the code is also defined here.
*
+ * Miha: branch trisurf-polyel
*/
/* Defines */
@@ -130,9 +131,12 @@
ts_uint coord_type;
} ts_coord;
+<<<<<<< HEAD
+=======
+>>>>>>> e9eab4fb2f72383a1a2adbe5f09f7bbd1fd45768
/** @brief Data structure of all data connected to a vertex
*
* ts_vertex holds the data for one single point (bead, vertex). To understand how to use it
@@ -161,6 +165,7 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
+ struct ts_poly *grafted_poly;
};
typedef struct ts_vertex ts_vertex;
@@ -173,12 +178,15 @@
typedef struct ts_vertex_list ts_vertex_list;
struct ts_bond {
- ts_uint idx;
+ ts_uint idx;
ts_vertex *vtx1;
ts_vertex *vtx2;
+ ts_vertex *adjvtx[2];
+ struct ts_triangle *tria[2];
ts_double bond_length;
ts_double bond_length_dual;
ts_bool tainted;
+ ts_double energy;
};
typedef struct ts_bond ts_bond;
@@ -235,18 +243,39 @@
+struct ts_poly {
+ ts_vertex_list *vlist;
+ ts_bond_list *blist;
+ ts_vertex *grafted_vtx;
+ ts_double k;
+};
+typedef struct ts_poly ts_poly;
+
+
+struct ts_poly_list {
+ ts_uint n;
+ ts_poly **poly;
+};
+typedef struct ts_poly_list ts_poly_list;
+
+
+
+
typedef struct {
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;
+
+ ts_poly_list *poly_list;
+ ts_double spring_constant;
} ts_vesicle;
--
Gitblit v1.9.3