From 8f94c84216247a1edd9f6cf756a167be35ed8057 Mon Sep 17 00:00:00 2001
From: Samo <samo@beti.(none)>
Date: Tue, 10 Jul 2012 05:36:57 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng

---
 src/main.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index b846658..f331f12 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,12 +61,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++){
+for(i=0;i<10000;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