Merge branch 'trisurf-polyel'

Samo Penic

2014-03-08 c0d703a09da108f218b687beeec671f71b7a44c9

 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,38 @@
*/

int main(int argv, char *argc[]){
ts_bool retval;
ts_vertex_list *vlist=init_vertex_list(5);
   ts_vesicle *vesicle;
   ts_tape *tape;
   ts_uint start_iteration=0;
   parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
   ts_fprintf(stdout,"Starting program...\n\n");
   if(force_from_tape){
      ts_fprintf(stdout,"************************************************\n");
      ts_fprintf(stdout,"**** Generating initial geometry from tape *****\n");
      ts_fprintf(stdout,"************************************************\n\n");
      tape=parsetape("tape");
      vesicle=create_vesicle_from_tape(tape);
   } else {

      ts_fprintf(stdout,"**********************************************************************\n");
      ts_fprintf(stdout,"**** Recreating vesicle from dump file and continuing simulation *****\n");
      ts_fprintf(stdout,"**********************************************************************\n\n");
      tape=parsetape("tape");
      vesicle=restore_state(&start_iteration);

retval=vtx_add_neighbour(VTX(1),VTX(0));
if(retval==TS_FAIL) printf("1. already a member or vertex is null!\n");
retval=vtx_add_neighbour(VTX(0),VTX(1));
if(retval==TS_FAIL) printf("2. already a member or vertex is null!\n");
VTX_DATA(1)->x=1.0;
vtx_list_free(vlist);
printf("Done.\n");
return 0; //program finished perfectly ok. We return 0.
      if(command_line_args.reset_iteration_count) start_iteration=0;
      else start_iteration++;

      if(start_iteration>=tape->iterations){
         ts_fprintf(stdout, "Simulation already completed. if you want to rerun it try with --force-from-tape or --reset-iteration-count\n\n");
         return 0;
      }
   }

   run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);
   write_master_xml_file("test.pvd");
   write_dout_fcompat_file(vesicle,"dout");
   vesicle_free(vesicle);
   tape_free(tape);
   return 0; //program finished perfectly ok. We return 0.
}