From 8db569a42c280be13ea9edbe4c528e0041b6fd3f Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 03 Dec 2013 13:05:49 +0000
Subject: [PATCH] Samo&Miha poly_list_free added.
---
src/main.c | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/main.c b/src/main.c
index c651382..b756320 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,6 +10,7 @@
#include "initial_distribution.h"
#include "frame.h"
#include "timestep.h"
+#include "poly.h"
/** Entrance function to the program
* @param argv is a number of parameters used in program call (including the program name
@@ -18,7 +19,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 +64,16 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
*/
-vesicle=parsetape(&n);
+vesicle=parsetape(&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);
+/*Testing */
+vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);
-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);
-}
-}
+poly_list_free(vesicle->poly_list);
+/*End testing*/
+
+run_simulation(vesicle, mcsweeps, inititer, iterations);
+
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
--
Gitblit v1.9.3