From 621830b501728adb038b37281bd23d678a3c053d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 07 Jun 2012 12:15:54 +0000
Subject: [PATCH] Moved Ylmi into vertex_ts datastructure, since it is vertex related
---
src/general.h | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/general.h b/src/general.h
index aff7680..2fe0ee2 100644
--- a/src/general.h
+++ b/src/general.h
@@ -110,6 +110,23 @@
/* STRUCTURES */
+
+/** @brief Data structure for keeping the coordinates in selected coordinate
+ * system
+ */
+#define TS_COORD_CARTESIAN 0
+#define TS_COORD_SPHERICAL 1
+#define TS_COORD_CYLINDRICAL 2
+
+typedef struct {
+ ts_double e1;
+ ts_double e2;
+ ts_double e3;
+ 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
@@ -134,6 +151,10 @@
ts_double xk;
ts_double c;
ts_uint id;
+ ts_double **Ylm;
+ ts_double projArea;
+ ts_double relR;
+ ts_double solAngle;
};
typedef struct ts_vertex ts_vertex;
@@ -166,6 +187,7 @@
ts_double xnorm;
ts_double ynorm;
ts_double znorm;
+ ts_double area; // firstly needed for sh.c
};
typedef struct ts_triangle ts_triangle;
@@ -193,6 +215,15 @@
typedef struct {
+ ts_uint l;
+ ts_uint i;
+ ts_double **ulm;
+ ts_double **co;
+} ts_spharm;
+
+
+
+typedef struct {
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_triangle_list *tlist;
@@ -202,9 +233,13 @@
ts_double dmax;
ts_double stepsize;
ts_double cm[3];
+ ts_double volume;
+ ts_spharm *sphHarmonics;
} ts_vesicle;
+
+
/* GLOBAL VARIABLES */
int quiet;
--
Gitblit v1.9.3