From 91c712c267f72f0dbbe865fec9d2eefd77ff8c0e Mon Sep 17 00:00:00 2001
From: Samo <samo@beti.(none)>
Date: Tue, 10 Jul 2012 05:36:21 +0000
Subject: [PATCH] Fixede bug in spherical harmonics. Added new test program with initial shape relaxation to sphere
---
src/main.c | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main.c b/src/main.c
index e4e1027..f331f12 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,20 +36,20 @@
retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
-vlist->vtx[0]->data->x=1.0;
-vlist->vtx[0]->data->x=1.1;
+vlist->vtx[0]->x=1.0;
+vlist->vtx[0]->x=1.1;
vlist1=vertex_list_copy(vlist);
bond_add(blist, vlist->vtx[1],vlist->vtx[0]);
triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
-printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->data->vertex[0]->data->x);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->vertex[0]->x);
cell_list_cell_occupation_clear(clist);
-printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
@@ -61,16 +61,23 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
vesicle=initial_distribution_dipyramid(17,60,60,60,0.15);
+//parsetape(vesicle,&i);
+
+//these four must come from parsetype!
+vesicle->dmax=1.67*1.67;
+vesicle->stepsize=0.15;
+vesicle->clist->max_occupancy=8;
+vesicle->bending_rigidity=25.0;
+fprintf(stderr,"xk=%f",vesicle->bending_rigidity);
centermass(vesicle);
cell_occupation(vesicle);
-
-for(i=0;i<100;i++)
+for(i=0;i<10000;i++){
single_timestep(vesicle);
-
-
-
-write_vertex_xml_file(vesicle,0);
+if(i%100==0){
+write_vertex_xml_file(vesicle,i/100);
+}
+}
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
--
Gitblit v1.9.3