From 311301bef2f4762781817a7553b56d827d2d8d7e Mon Sep 17 00:00:00 2001
From: Miha <mihaf@hapi.(none)>
Date: Fri, 29 Nov 2013 08:44:43 +0000
Subject: [PATCH] First test of new branch. Nothing done yet.
---
src/general.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/general.h b/src/general.h
index 2fe0ee2..063e124 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 */
@@ -151,7 +152,6 @@
ts_double xk;
ts_double c;
ts_uint id;
- ts_double **Ylm;
ts_double projArea;
ts_double relR;
ts_double solAngle;
@@ -170,6 +170,7 @@
ts_vertex *vtx2;
ts_double bond_length;
ts_double bond_length_dual;
+ ts_bool tainted;
};
typedef struct ts_bond ts_bond;
@@ -188,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,9 +218,11 @@
typedef struct {
ts_uint l;
- ts_uint i;
ts_double **ulm;
+ ts_double **sumUlm2;
+ ts_uint N;
ts_double **co;
+ ts_double ***Ylmi;
} ts_spharm;
--
Gitblit v1.9.3