From 8db569a42c280be13ea9edbe4c528e0041b6fd3f Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 03 Dec 2013 13:05:49 +0000
Subject: [PATCH] Samo&Miha poly_list_free added.
---
src/general.h | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/general.h b/src/general.h
index 0c1526b..5194460 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 */
@@ -125,8 +126,6 @@
ts_uint coord_type;
} ts_coord;
-
-
/** @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
@@ -154,6 +153,7 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
+ struct ts_poly *grafted_poly;
};
typedef struct ts_vertex ts_vertex;
@@ -169,6 +169,7 @@
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
+ ts_bool tainted;
};
typedef struct ts_bond ts_bond;
@@ -187,6 +188,7 @@
ts_double ynorm;
ts_double znorm;
ts_double area; // firstly needed for sh.c
+ ts_double volume; // firstly needed for sh.c
};
typedef struct ts_triangle ts_triangle;
@@ -215,11 +217,29 @@
typedef struct {
ts_uint l;
- ts_uint i;
ts_double **ulm;
+ ts_double **sumUlm2;
+ ts_uint N;
ts_double **co;
ts_double ***Ylmi;
} ts_spharm;
+
+
+
+struct ts_poly {
+ ts_vertex_list *vlist;
+ ts_bond_list *blist;
+ ts_vertex *grafted_vtx;
+};
+typedef struct ts_poly ts_poly;
+
+
+struct ts_poly_list {
+ ts_uint n;
+ ts_poly **poly;
+};
+typedef struct ts_poly_list ts_poly_list;
+
@@ -235,6 +255,7 @@
ts_double cm[3];
ts_double volume;
ts_spharm *sphHarmonics;
+ ts_poly_list *poly_list;
} ts_vesicle;
--
Gitblit v1.9.3