From 3131dcbf73ff8a0699a688119d57eaf386f49590 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo@andromeda>
Date: Mon, 27 Dec 2010 17:14:57 +0000
Subject: [PATCH] Bug in calculating members solved!
---
src/main.c | 5 +++--
src/vertex.c | 13 ++++++++-----
src/tape | 2 +-
src/initial_distribution.c | 2 +-
src/triangle.c | 6 ++++--
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 6a13a23..00d9138 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -348,7 +348,7 @@
//TODO: probably something wrong with neighbour distribution.
// if(vtx[i]==k3 || vtx[i]==k4 || vtx[i]==k5){
- if(i==6) ts_fprintf(stdout, "Vtx[%u] > Added to tristar!\n",i);
+// if(i==6) ts_fprintf(stdout, "Vtx[%u] > Added to tristar!\n",i);
vertex_add_tristar(vtx[i],tria[k]);
}
}
diff --git a/src/main.c b/src/main.c
index d0ee34d..d4cc0c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,7 +17,7 @@
int main(int argv, char *argc[]){
ts_bool retval;
-ts_vertex_list *vlist=init_vertex_list(5);
+ ts_vertex_list *vlist=init_vertex_list(5);
ts_vertex_list *vlist1;
ts_bond_list *blist=init_bond_list();
ts_triangle_list *tlist=init_triangle_list();
@@ -57,9 +57,10 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
-vesicle=initial_distribution_dipyramid(7,10,10,10,0.3);
+vesicle=initial_distribution_dipyramid(17,10,10,10,0.15);
write_vertex_xml_file(vesicle,0);
write_master_xml_file("test.pvd");
+write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
return 0; //program finished perfectly ok. We return 0.
diff --git a/src/tape b/src/tape
index 64f529a..38518d3 100644
--- a/src/tape
+++ b/src/tape
@@ -1,6 +1,6 @@
####### Vesicle definitions ###########
# nshell is a number of divisions of dipyramid
-nshell=20
+nshell=17
# dmax is the square of the bond length
dmax=1.67
# bending rigidity of the membrane
diff --git a/src/triangle.c b/src/triangle.c
index 959205a..53143af 100644
--- a/src/triangle.c
+++ b/src/triangle.c
@@ -98,13 +98,15 @@
if(tria->data->neigh == NULL)
fatal("Reallocation of memory failed during insertion of triangle neighbour in triangle_add_neighbour",3);
tria->data->neigh[tria->data->neigh_no-1]=ntria;
-
+
+
/* we repeat the procedure for the neighbour */
- ntria->data->neigh_no++;
+/* ntria->data->neigh_no++;
ntria->data->neigh=realloc(ntria->data->neigh,ntria->data->neigh_no*sizeof(ts_triangle *));
if(ntria->data->neigh == NULL)
fatal("Reallocation of memory failed during insertion of triangle neighbour in triangle_add_neighbour",3);
ntria->data->neigh[ntria->data->neigh_no-1]=tria;
+*/
return TS_SUCCESS;
}
diff --git a/src/vertex.c b/src/vertex.c
index 92c5032..ccd661e 100644
--- a/src/vertex.c
+++ b/src/vertex.c
@@ -52,16 +52,19 @@
ts_uint nn=++vtx->data->neigh_no;
vtx->data->neigh=(ts_vertex **)realloc(vtx->data->neigh, nn*sizeof(ts_vertex *));
vtx->data->neigh[nn-1]=nvtx;
-
+/* This was a bug in creating DIPYRAMID (the neighbours were not in right
+ * order).
+ */
/* pa se sosedu dodamo vertex */
/*if it is already a neighbour don't add it to the list */
+/*
for(i=0; i<nvtx->data->neigh_no;i++){
if(nvtx->data->neigh[i]==vtx) return TS_FAIL;
}
nn=++nvtx->data->neigh_no;
nvtx->data->neigh=(ts_vertex **)realloc(nvtx->data->neigh, nn*sizeof(ts_vertex *));
nvtx->data->neigh[nn-1]=vtx;
-
+*/
return TS_SUCCESS;
}
@@ -108,12 +111,12 @@
bond=bond_add(blist,vtx1,vtx2);
if(bond==NULL) return TS_FAIL;
vtx1->data->bond_no++;
- vtx2->data->bond_no++;
+ // vtx2->data->bond_no++;
vtx1->data->bond=(ts_bond **)realloc(vtx1->data->bond, vtx1->data->bond_no*sizeof(ts_bond *));
- vtx2->data->bond=(ts_bond **)realloc(vtx2->data->bond, vtx2->data->bond_no*sizeof(ts_bond *));
+ // vtx2->data->bond=(ts_bond **)realloc(vtx2->data->bond, vtx2->data->bond_no*sizeof(ts_bond *));
vtx1->data->bond[vtx1->data->bond_no-1]=bond;
- vtx2->data->bond[vtx2->data->bond_no-1]=bond;
+ // vtx2->data->bond[vtx2->data->bond_no-1]=bond;
return TS_SUCCESS;
}
--
Gitblit v1.9.3