From a63f1719d2c7fd2c69accc0eb3eb038af50e555e Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 Jul 2012 13:10:01 +0000
Subject: [PATCH] Fixed frame to make changes in cell.
---
src/main.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
index b846658..d84b611 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,11 +30,12 @@
retval=vtx_add_cneighbour(blist,vlist->vtx[1],vlist->vtx[0]);
if(retval==TS_FAIL) printf("1. already a member or vertex is null!\n");
-retval=vtx_add_cneighbour(blist,vlist->vtx[0],vlist->vtx[1]);
+retval=vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-
-retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
+fprintf(stderr,"Was here");
+retval=vtx_remove_neighbour(vlist->vtx[1],vlist->vtx[0]);
vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
+fprintf(stderr,"Was here too!\n");
vlist->vtx[0]->x=1.0;
vlist->vtx[0]->x=1.1;
@@ -61,12 +62,22 @@
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++){
single_timestep(vesicle);
-write_vertex_xml_file(vesicle,i);
+if(i%100==0){
+write_vertex_xml_file(vesicle,i/100);
+}
}
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
--
Gitblit v1.9.3