Fixed bugs when dump file is missing. Prepared flags for setting filenames

Samo Penic

2014-03-11 3f5c83bc26e98dd41e93fc9023a610cd0ec1d363

 src/main.c

@@ -22,27 +22,45 @@
   ts_vesicle *vesicle;
   ts_tape *tape;
   ts_uint start_iteration=0;
   parse_args(argv,argc);
   ts_fprintf(stdout,"\nStarting program...\n\n");
if(force_from_tape){
ts_fprintf(stdout,"****************************************************\n");
ts_fprintf(stdout,"**** Reinitializing initial geometry from tape *****\n");
ts_fprintf(stdout,"****************************************************\n\n");
tape=parsetape("tape");
vesicle=create_vesicle_from_tape(tape);
} else {
   force_from_tape=0;
   parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
   ts_fprintf(stdout,"Starting program...\n\n");
   if(command_line_args.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);
}
      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);
        if(vesicle==NULL){
            ts_fprintf(stderr, "Dump file does not exist or is not a regular file! Did you mean to invoke trisurf with --force-from-tape option?\n\n");
            return 1;
        }
      // nove vrednosti iz tapea...
      vesicle->bending_rigidity=tape->xk0;
      vtx_set_global_values(vesicle);
      vesicle->pressure=tape->pressure;
      vesicle->dmax=tape->dmax*tape->dmax;

run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations);
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.
      if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
      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.
}