From 6ff352778b5e922bf1c3517ffb78e3693cd726fd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 05 Mar 2014 16:51:29 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng
---
src/main.c | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main.c b/src/main.c
index c651382..941daaf 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,27 @@
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*/
+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);
+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);
+
write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
--
Gitblit v1.9.3