From 41a0355002fda513dbf8d878b6793e1f21a20ef1 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Thu, 23 Feb 2012 14:37:22 +0000 Subject: [PATCH] triangle data removed --- src/initial_distribution.c | 92 +++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/initial_distribution.c b/src/initial_distribution.c index 4881e11..0f59aec 100644 --- a/src/initial_distribution.c +++ b/src/initial_distribution.c @@ -20,13 +20,15 @@ retval = vtx_set_global_values(vesicle); retval = pentagonal_dipyramid_vertex_distribution(vesicle->vlist); retval = init_vertex_neighbours(vesicle->vlist); - retval = init_sort_neighbours(vesicle->vlist); - retval = init_vesicle_bonds(vesicle); + vesicle->vlist = init_sort_neighbours(vesicle->blist,vesicle->vlist); + // retval = init_vesicle_bonds(vesicle); // bonds are created in sort_neigh retval = init_triangles(vesicle); retval = init_triangle_neighbours(vesicle); retval = init_common_vertex_triangle_neighbours(vesicle); + retval = init_normal_vectors(vesicle->tlist); retval = mean_curvature_and_energy(vesicle); ts_fprintf(stderr,"initial_distribution finished!\n"); + if(retval); return vesicle; } @@ -150,21 +152,21 @@ return TS_SUCCESS; } -// TODO: with new datastructure can be rewritten. -ts_bool init_sort_neighbours(ts_vertex_list *vlist){ +// TODO: with new datastructure can be rewritten. Partially it is done, but it is complicated. +ts_vertex_list *init_sort_neighbours(ts_bond_list *blist,ts_vertex_list *vlist){ ts_vertex **vtx=vlist->vtx -1; // take a look at dipyramid function for comment. ts_uint i,l,j,jj,jjj,k=0; ts_double eps=0.001; // Take a look if EPS from math.h can be used /*lets initialize memory for temporary vertex_list. Should we write a function instead */ - ts_vertex_list *tvlist=init_vertex_list(vlist->n); + ts_vertex_list *tvlist=vertex_list_copy(vlist); ts_vertex **tvtx=tvlist->vtx -1; /* again to compensate for 0-indexing */ ts_double dist2; // Square of distance of neighbours ts_double direct; // Something, dont know what, but could be normal of some kind for(i=1;i<=vlist->n;i++){ k++; // WHY i IS NOT GOOD?? - vtx_add_neighbour(tvtx[k], tvtx[vtx[i]->data->neigh[0]->idx+1]); //always add 1st + vtx_add_cneighbour(blist,tvtx[k], tvtx[vtx[i]->data->neigh[0]->idx+1]); //always add 1st jjj=1; jj=1; for(l=2;l<=vtx[i]->data->neigh_no;l++){ @@ -172,7 +174,7 @@ dist2=vtx_distance_sq(vtx[i]->data->neigh[j-1],vtx[i]->data->neigh[jj-1]); direct=vtx_direct(vtx[i],vtx[i]->data->neigh[j-1],vtx[i]->data->neigh[jj-1]); if( (fabs(dist2-A0*A0)<=eps) && (direct>0.0) && (j!=jjj) ){ - vtx_add_neighbour(tvtx[k],tvtx[vtx[i]->data->neigh[j-1]->idx+1]); + vtx_add_cneighbour(blist,tvtx[k],tvtx[vtx[i]->data->neigh[j-1]->idx+1]); jjj=jj; jj=j; break; @@ -180,24 +182,19 @@ } } } - - for(i=1;i<=vlist->n;i++){ - for(j=1;j<=vtx[i]->data->neigh_no;j++){ - if(vtx[i]->data->neigh_no!=tvtx[i]->data->neigh_no){ //doesn't work with nshell=1! -// fprintf(stderr,"data1=%u data2=%u\n",vtx[i]->data->neigh_no,tvtx[i]->data->neigh_no); - fatal("Number of neighbours not the same in init_sort_neighbours.",4); - } - //we must correct the pointers in original to point to their - //neighbours according to indexes. Must be sure not to do it any - //other way! Also, we need to repair the collection of bonds... - vtx[i]->data->neigh[j-1]=vtx[tvtx[i]->data->neigh[j-1]->idx+1]; - } +/* We use the temporary vertex for our main vertices and we abandon main + * vertices, because their neighbours are not correctly ordered */ + // tvtx=vlist->vtx; + // vlist->vtx=tvtx; + // tvlist->vtx=vtx; + vtx_list_free(vlist); +/* Let's make a check if the number of bonds is correct */ + if((blist->n)!=3*(tvlist->n-2)){ + ts_fprintf(stderr,"Number of bonds is %u should be %u!\n", blist->n, 3*(tvlist->n-2)); + fatal("Number of bonds is not 3*(no_vertex-2).",4); } - // Must free memory for temporary vertex array to avoid memory leak! HERE! NOW! -// free_vertex(tvlist.vertex,tvlist.n); - vtx_list_free(tvlist); - return TS_SUCCESS; + return tvlist; } @@ -253,7 +250,7 @@ for(i=0;i<tlist->n;i++){ k=0; for(j=0;j<3;j++){ - if(tlist->tria[i]->data->vertex[j]!=NULL) + if(tlist->tria[i]->vertex[j]!=NULL) k++; } if(k!=3){ @@ -277,14 +274,14 @@ ts_triangle **tria=tlist->tria -1; nobo=0; for(i=1;i<=tlist->n;i++){ - i1=tria[i]->data->vertex[0]; - i2=tria[i]->data->vertex[1]; - i3=tria[i]->data->vertex[2]; + i1=tria[i]->vertex[0]; + i2=tria[i]->vertex[1]; + i3=tria[i]->vertex[2]; for(j=1;j<=tlist->n;j++){ if(j==i) continue; - j1=tria[j]->data->vertex[0]; - j2=tria[j]->data->vertex[1]; - j3=tria[j]->data->vertex[2]; + j1=tria[j]->vertex[0]; + j2=tria[j]->vertex[1]; + j3=tria[j]->vertex[2]; if((i1==j1 && i3==j2) || (i1==j2 && i3==j3) || (i1==j3 && i3==j1)){ triangle_add_neighbour(tria[i],tria[j]); nobo++; @@ -292,14 +289,14 @@ } } for(i=1;i<=tlist->n;i++){ - i1=tria[i]->data->vertex[0]; - i2=tria[i]->data->vertex[1]; - i3=tria[i]->data->vertex[2]; + i1=tria[i]->vertex[0]; + i2=tria[i]->vertex[1]; + i3=tria[i]->vertex[2]; for(j=1;j<=tlist->n;j++){ if(j==i) continue; - j1=tria[j]->data->vertex[0]; - j2=tria[j]->data->vertex[1]; - j3=tria[j]->data->vertex[2]; + j1=tria[j]->vertex[0]; + j2=tria[j]->vertex[1]; + j3=tria[j]->vertex[2]; if((i1==j1 && i2==j3) || (i1==j3 && i2==j2) || (i1==j2 && i2==j1)){ triangle_add_neighbour(tria[i],tria[j]); nobo++; @@ -307,14 +304,14 @@ } } for(i=1;i<=tlist->n;i++){ - i1=tria[i]->data->vertex[0]; - i2=tria[i]->data->vertex[1]; - i3=tria[i]->data->vertex[2]; + i1=tria[i]->vertex[0]; + i2=tria[i]->vertex[1]; + i3=tria[i]->vertex[2]; for(j=1;j<=tlist->n;j++){ if(j==i) continue; - j1=tria[j]->data->vertex[0]; - j2=tria[j]->data->vertex[1]; - j3=tria[j]->data->vertex[2]; + j1=tria[j]->vertex[0]; + j2=tria[j]->vertex[1]; + j3=tria[j]->vertex[2]; if((i2==j1 && i3==j3) || (i2==j3 && i3==j2) || (i2==j2 && i3==j1)){ triangle_add_neighbour(tria[i],tria[j]); nobo++; @@ -343,14 +340,17 @@ if(j == vtx[i]->data->neigh_no) jp=1; k2=vtx[i]->data->neigh[jp-1]; for(k=1;k<=tlist->n;k++){ // VERY NON-OPTIMAL!!! too many loops (vlist.n * vtx.neigh * tlist.n )! - k3=tria[k]->data->vertex[0]; - k4=tria[k]->data->vertex[1]; - k5=tria[k]->data->vertex[2]; + k3=tria[k]->vertex[0]; + k4=tria[k]->vertex[1]; + k5=tria[k]->vertex[2]; // ts_fprintf(stderr,"%u %u: k=(%u %u %u)\n",k1,k2,k3,k4,k5); if((vtx[i]==k3 && k1==k4 && k2==k5) || (vtx[i]==k4 && k1==k5 && k2==k3) || (vtx[i]==k5 && k1==k3 && k2==k4)){ - // ts_fprintf(stderr, "Added to tristar! "); + +//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); vertex_add_tristar(vtx[i],tria[k]); } } -- Gitblit v1.9.3