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 | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/general.h b/src/general.h
index 1a90e97..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
@@ -154,6 +154,7 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
+ ts_uint *locked;
};
typedef struct ts_vertex ts_vertex;
@@ -169,6 +170,7 @@
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
+ ts_bool tainted;
};
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;
@@ -216,11 +219,18 @@
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;
@@ -234,6 +244,8 @@
ts_double cm[3];
ts_double volume;
ts_spharm *sphHarmonics;
+ ts_uint threads;
+ ts_mutex *mutex;
} ts_vesicle;
--
Gitblit v1.9.3