From 352fad2165896fe4bedda7fdc355950c4cbcb37c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 12 Jul 2012 15:51:17 +0000
Subject: [PATCH] Gained another 25-30%.
---
src/general.h | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/src/general.h b/src/general.h
index ca778bf..6263862 100644
--- a/src/general.h
+++ b/src/general.h
@@ -2,6 +2,7 @@
#define _GENERAL_H
#include<stdarg.h>
+#include<stdio.h>
/* @brief This is a header file, defining general constants and structures.
* @file header.h
@@ -109,12 +110,29 @@
/* 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_data holds the data for one single point (bead, vertex). To understand how to use it
+ * ts_vertex holds the data for one single point (bead, vertex). To understand how to use it
* here is a detailed description of the fields in the data structure. */
-struct ts_vertex_data {
- ts_uint idx; /**< Represents index of the vertex point. Should become obsolete, since it is also present in ts_vertex structure. */
+struct ts_vertex {
+ ts_uint idx;
ts_double x; /**< The x coordinate of vertex. */
ts_double y; /**< The y coordinate of vertex. */
ts_double z; /**< The z coordinate of vertex. */
@@ -133,12 +151,9 @@
ts_double xk;
ts_double c;
ts_uint id;
-};
-typedef struct ts_vertex_data ts_vertex_data;
-
-struct ts_vertex {
- ts_uint idx;
- ts_vertex_data *data;
+ ts_double projArea;
+ ts_double relR;
+ ts_double solAngle;
};
typedef struct ts_vertex ts_vertex;
@@ -148,18 +163,12 @@
} ts_vertex_list;
-
-/** ts_bond_data is a structure that describes a bond */
-typedef struct {
+struct ts_bond {
+ ts_uint idx;
ts_vertex *vtx1;
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
-} ts_bond_data;
-
-struct ts_bond {
- ts_uint idx;
- ts_bond_data *data;
};
typedef struct ts_bond ts_bond;
@@ -169,22 +178,16 @@
};
typedef struct ts_bond_list ts_bond_list;
-/** ts_triangle_data is a structure that describes a triangle */
-struct ts_triangle_data {
- ts_uint idx;
+struct ts_triangle {
+ ts_uint idx;
ts_vertex *vertex[3];
ts_uint neigh_no;
struct ts_triangle **neigh;
ts_double xnorm;
ts_double ynorm;
ts_double znorm;
-
-};
-typedef struct ts_triangle_data ts_triangle_data;
-
-struct ts_triangle {
- ts_uint idx;
- ts_triangle_data *data;
+ ts_double area; // firstly needed for sh.c
+ ts_double volume; // firstly needed for sh.c
};
typedef struct ts_triangle ts_triangle;
@@ -194,14 +197,11 @@
};
typedef struct ts_triangle_list ts_triangle_list;
-typedef struct ts_cell_data {
- ts_vertex **vertex;
- ts_uint nvertex;
-} ts_cell_data;
typedef struct ts_cell {
ts_uint idx;
- ts_cell_data *data;
+ ts_vertex **vertex;
+ ts_uint nvertex;
} ts_cell;
typedef struct ts_cell_list{
@@ -215,6 +215,17 @@
typedef struct {
+ ts_uint l;
+ ts_double **ulm;
+ ts_double **sumUlm2;
+ ts_uint N;
+ ts_double **co;
+ ts_double ***Ylmi;
+} ts_spharm;
+
+
+
+typedef struct {
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_triangle_list *tlist;
@@ -224,7 +235,11 @@
ts_double dmax;
ts_double stepsize;
ts_double cm[3];
+ ts_double volume;
+ ts_spharm *sphHarmonics;
} ts_vesicle;
+
+
/* GLOBAL VARIABLES */
@@ -247,7 +262,7 @@
*/
void fatal(char *text, ts_int errcode);
-//ts_uint ts_fprintf(FILE *fd, char *fmt, va_list ap);
+ts_uint ts_fprintf(FILE *fd, char *fmt, ...);
#define VTX(n) &(vlist->vtx[n])
#define VTX_DATA(n) vlist->vtx[n].data
--
Gitblit v1.9.3