From 0652ee2715994b48a9bbfd1132bf0b65ad206289 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Nov 2013 18:46:13 +0000
Subject: [PATCH] commiting all changes.
---
src/general.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/src/general.h b/src/general.h
index aff7680..fdf10a2 100644
--- a/src/general.h
+++ b/src/general.h
@@ -3,7 +3,7 @@
#include<stdarg.h>
#include<stdio.h>
-
+#include<pthread.h>
/* @brief This is a header file, defining general constants and structures.
* @file header.h
* @author Samo Penic
@@ -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 projArea;
+ ts_double relR;
+ ts_double solAngle;
+ ts_uint *locked;
};
typedef struct ts_vertex ts_vertex;
@@ -149,6 +170,7 @@
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
+ ts_bool tainted;
};
typedef struct ts_bond ts_bond;
@@ -166,6 +188,8 @@
ts_double xnorm;
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;
@@ -193,6 +217,22 @@
typedef struct {
+ ts_uint l;
+ ts_double **ulm;
+ ts_double **sumUlm2;
+ ts_uint N;
+ ts_double **co;
+ ts_double ***Ylmi;
+} ts_spharm;
+
+
+typedef struct {
+ pthread_mutex_t vtx_taint;
+ pthread_mutex_t vtx_untaint;
+ pthread_mutex_t cell_modify;
+} ts_mutex;
+
+typedef struct {
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_triangle_list *tlist;
@@ -202,9 +242,15 @@
ts_double dmax;
ts_double stepsize;
ts_double cm[3];
+ ts_double volume;
+ ts_spharm *sphHarmonics;
+ ts_uint threads;
+ ts_mutex *mutex;
} ts_vesicle;
+
+
/* GLOBAL VARIABLES */
int quiet;
--
Gitblit v1.9.3