From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.
---
src/main.c | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main.c b/src/main.c
index 941daaf..705d8de 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
int main(int argv, char *argc[]){
ts_uint inititer,mcsweeps, iterations;
-ts_vesicle *vesicle;
+ts_vesicle *vesicle, *vesicle1;
/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
ts_vertex_list *vlist=init_vertex_list(5);
@@ -64,27 +64,19 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
*/
-vesicle=parsetape(&mcsweeps, &inititer, &iterations);
+vesicle1=parsetape(&mcsweeps, &inititer, &iterations);
/*Testing */
//vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);
//poly_list_free(vesicle->poly_list);
/*End testing*/
-printf("Vertex %d ima x komponento %e\n",123,vesicle->vlist->vtx[123]->x);
-dump_state(vesicle);
-vesicle->vlist->vtx[123]->x=123.0;
-printf("Vertex %d ima x komponento %e\n",123,vesicle->vlist->vtx[123]->x);
-write_vertex_xml_file(vesicle,0);
+
+dump_state(vesicle1);
+
vesicle=restore_state();
-printf("Stevilo vertexov je %d\n",vesicle->vlist->n);
-printf("Vertex %d ima x komponento %e\n",123,vesicle->vlist->vtx[123]->x);
-write_vertex_xml_file(vesicle,1);
-write_master_xml_file("test.pvd");
-return 0;
-
-run_simulation(vesicle, mcsweeps, inititer, iterations);
-
+//vesicle_free(vesicle1);
+run_simulation(vesicle1, mcsweeps, inititer, iterations);
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
--
Gitblit v1.9.3