From 83b03a38e0ab88224d3f8ce9ddfbbdd82038455c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 23 Feb 2012 21:55:40 +0000
Subject: [PATCH] Seems to work. Lookout for debug code in main.c and initial_distribution.c
---
src/general.h | 41 +++++++++--------------------------------
1 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/src/general.h b/src/general.h
index 8bfdf73..aff7680 100644
--- a/src/general.h
+++ b/src/general.h
@@ -112,10 +112,10 @@
/** @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. */
@@ -135,12 +135,6 @@
ts_double c;
ts_uint id;
};
-typedef struct ts_vertex_data ts_vertex_data;
-
-struct ts_vertex {
- ts_uint idx;
- ts_vertex_data *data;
-};
typedef struct ts_vertex ts_vertex;
typedef struct {
@@ -149,18 +143,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;
@@ -170,22 +158,14 @@
};
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;
};
typedef struct ts_triangle ts_triangle;
@@ -195,14 +175,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{
--
Gitblit v1.9.3