From d7a113d890064e18aa9f4267c33ac71348c6ba98 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 04 Nov 2013 21:54:22 +0000
Subject: [PATCH] Changes in main loop. It allows setting inner, outer loop and initial mc sweeps to be discarded
---
src/main.c | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/src/main.c b/src/main.c
index c651382..7e12c1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,7 @@
*/
int main(int argv, char *argc[]){
-ts_uint i,n;
+ts_uint inititer,mcsweeps, iterations;
ts_vesicle *vesicle;
/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
@@ -63,25 +63,9 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
*/
-vesicle=parsetape(&n);
+vesicle=parsetape(&mcsweeps, &inititer, &iterations);
+run_simulation(vesicle, mcsweeps, inititer, iterations);
-//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\n",vesicle->bending_rigidity);
-
-centermass(vesicle);
-cell_occupation(vesicle);
-for(i=0;i<n;i++){
-single_timestep(vesicle);
-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