From 86f5e72cbecb70197e77fb5e411874d6b015ebdd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:45:36 +0000
Subject: [PATCH] Dump and restore complete and debugged. Still, use with caution
---
src/general.h | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/general.h b/src/general.h
index b775bd2..e7e9545 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;
@@ -164,11 +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;
@@ -187,6 +189,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 +218,30 @@
typedef struct {
ts_uint l;
- ts_uint i;
- ts_double ***Ylmi;
ts_double **ulm;
- ts_uint **co;
+ 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;
+ 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;
+
@@ -227,14 +249,17 @@
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