From b866cf902b92a94fb438e40a24dae0a89fa2afec Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 07 Mar 2014 14:01:07 +0000
Subject: [PATCH] Changed bondflip. lm, lp found before and only once
---
src/main.c | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/src/main.c b/src/main.c
index d6c2854..53f4b0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,8 +2,15 @@
#include<math.h>
#include "general.h"
#include "vertex.h"
-//#include "io.h"
-//#include "initial_timestep.h"
+#include "bond.h"
+#include "triangle.h"
+#include "cell.h"
+#include "vesicle.h"
+#include "io.h"
+#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
@@ -12,16 +19,64 @@
*/
int main(int argv, char *argc[]){
+ts_uint inititer,mcsweeps, iterations;
+ts_vesicle *vesicle;
+/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
-ts_vertex_list *vlist=init_vertex_list(5);
+ ts_vertex_list *vlist=init_vertex_list(5);
+ts_vertex_list *vlist1;
+ts_bond_list *blist=init_bond_list();
+ts_triangle_list *tlist=init_triangle_list();
+ts_cell_list *clist=init_cell_list(3,3,3,0.3);
-
-retval=vtx_add_neighbour(VTX(1),VTX(0));
+retval=vtx_add_cneighbour(blist,vlist->vtx[1],vlist->vtx[0]);
if(retval==TS_FAIL) printf("1. already a member or vertex is null!\n");
-retval=vtx_add_neighbour(VTX(0),VTX(1));
+
+retval=vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
-VTX_DATA(1)->x=1.0;
+fprintf(stderr,"Was here");
+retval=vtx_remove_neighbour(vlist->vtx[1],vlist->vtx[0]);
+vtx_add_neighbour(vlist->vtx[0],vlist->vtx[1]);
+fprintf(stderr,"Was here too!\n");
+
+vlist->vtx[0]->x=1.0;
+vlist->vtx[0]->x=1.1;
+vlist1=vertex_list_copy(vlist);
+bond_add(blist, vlist->vtx[1],vlist->vtx[0]);
+triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
+
+triangle_add(tlist,vlist->vtx[1],vlist->vtx[2],vlist->vtx[3]);
+
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+cell_add_vertex(clist->cell[0], vlist->vtx[0]);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->vertex[0]->x);
+cell_list_cell_occupation_clear(clist);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
+cell_add_vertex(clist->cell[0], vlist->vtx[0]);
+
+
+triangle_list_free(tlist);
+bond_list_free(blist);
vtx_list_free(vlist);
-printf("Done.\n");
+cell_list_free(clist);
+
+vtx_list_free(vlist1);
+printf("Tests complete.\n");
+*/
+vesicle=parsetape(&mcsweeps, &inititer, &iterations);
+
+/*Testing */
+//vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);
+
+//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);
+
return 0; //program finished perfectly ok. We return 0.
}
--
Gitblit v1.9.3