From 0fb40c28545e8418469cf7d3600547dfe4083edb Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 08 Mar 2014 12:00:38 +0000
Subject: [PATCH] Merged with dump-state. Added some arg switches that need to be inished
---
src/main.c | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/src/main.c b/src/main.c
index 9112278..0c955dc 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,23 +19,29 @@
*/
int main(int argv, char *argc[]){
+ts_uint inititer,mcsweeps, iterations;
+ts_vesicle *vesicle, *vesicle1;
+
+
+parse_args(argv,argc);
+
+/* THIS SHOULD GO INTO UNIT TEST
ts_bool retval;
-ts_uint i;
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]->x=1.0;
vlist->vtx[0]->x=1.1;
@@ -60,24 +67,23 @@
vtx_list_free(vlist1);
printf("Tests complete.\n");
-vesicle=initial_distribution_dipyramid(8,60,60,60,0.15);
-//parsetape(vesicle,&i);
+*/
+if(force_from_tape){
+ts_fprintf(stdout,"****************************************************\n");
+ts_fprintf(stdout,"**** Reinitializing initial geometry from tape *****\n");
+ts_fprintf(stdout,"****************************************************\n\n");
+vesicle=parsetape(&mcsweeps, &inititer, &iterations);
+} else {
-//these four must come from parsetype!
-vesicle->dmax=1.67;
-vesicle->stepsize=0.15;
-vesicle->clist->max_occupancy=8;
-vesicle->bending_rigidity=25.0;
-fprintf(stderr,"xk=%f",vesicle->bending_rigidity);
+ts_fprintf(stdout,"**********************************************************************\n");
+ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
+ts_fprintf(stdout,"**********************************************************************\n\n");
+vesicle1=parsetape(&mcsweeps, &inititer, &iterations);
+vesicle=restore_state();
+vesicle_free(vesicle1);
+}
-centermass(vesicle);
-cell_occupation(vesicle);
-for(i=0;i<10000;i++){
-single_timestep(vesicle);
-if(i%100==0){
-write_vertex_xml_file(vesicle,i/100);
-}
-}
+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