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 | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/main.c b/src/main.c
index b0886f6..705d8de 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,8 +6,11 @@
#include "triangle.h"
#include "cell.h"
#include "vesicle.h"
-//#include "io.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
@@ -16,36 +19,40 @@
*/
int main(int argv, char *argc[]){
+ts_uint inititer,mcsweeps, iterations;
+ts_vesicle *vesicle, *vesicle1;
+/* 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);
-ts_vesicle *vesicle;
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_cneighbour(blist,vlist->vtx[0],vlist->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");
-
-retval=vtx_remove_neighbour(vlist->vtx[0],vlist->vtx[1]);
+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]->data->x=1.0;
-vlist->vtx[0]->data->x=1.1;
-
+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]->data->nvertex);
+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]->data->nvertex);
-printf("Cell idx=1 has vertex[0] has x coordinate=%e\n",clist->cell[0]->data->vertex[0]->data->x);
+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]->data->nvertex);
+printf("Cell idx=1 has vertices=%u\n",clist->cell[0]->nvertex);
cell_add_vertex(clist->cell[0], vlist->vtx[0]);
@@ -53,10 +60,25 @@
bond_list_free(blist);
vtx_list_free(vlist);
cell_list_free(clist);
+
+vtx_list_free(vlist1);
printf("Tests complete.\n");
+*/
+vesicle1=parsetape(&mcsweeps, &inititer, &iterations);
-vesicle=initial_distribution_dipyramid(7,10,10,10,0.3);
+/*Testing */
+//vesicle->poly_list=init_poly_list(1400,20,vesicle->vlist);
+//poly_list_free(vesicle->poly_list);
+/*End testing*/
+
+dump_state(vesicle1);
+
+vesicle=restore_state();
+//vesicle_free(vesicle1);
+run_simulation(vesicle1, 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