From 23b0edbc039c47c7b39288c8e16a72c968cfe3b3 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 10 Jul 2012 12:45:50 +0000
Subject: [PATCH] Merged with bondflip debug branch
---
src/main.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main.c b/src/main.c
index 9112278..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;
@@ -60,11 +61,11 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
-vesicle=initial_distribution_dipyramid(8,60,60,60,0.15);
+vesicle=initial_distribution_dipyramid(17,60,60,60,0.15);
//parsetape(vesicle,&i);
//these four must come from parsetype!
-vesicle->dmax=1.67;
+vesicle->dmax=1.67*1.67;
vesicle->stepsize=0.15;
vesicle->clist->max_occupancy=8;
vesicle->bending_rigidity=25.0;
@@ -72,7 +73,7 @@
centermass(vesicle);
cell_occupation(vesicle);
-for(i=0;i<10000;i++){
+for(i=0;i<100;i++){
single_timestep(vesicle);
if(i%100==0){
write_vertex_xml_file(vesicle,i/100);
--
Gitblit v1.9.3