ulm2 calculations in tsmeasure.c

Samo Penic

2016-05-25 fcfb89f8e0056e10631d3b09fca90bad7241db0e

 src/main.c

@@ -1,3 +1,4 @@
/* vim: set ts=4 sts=4 sw=4 noet : */
#include<stdio.h>
#include<math.h>
#include<stdlib.h>
@@ -14,7 +15,10 @@
#include "poly.h"
#include "sh.h"
#include "shcomplex.h"
#include "dumpstate.h"
#include "restore.h"

#include <fcntl.h>
/** Entrance function to the program
  * @param argv is a number of parameters used in program call (including the program name
  * @param argc is a pointer to strings (character arrays) which holds the arguments
@@ -26,9 +30,39 @@
   ts_tape *tape;
   ts_uint start_iteration=0;
   force_from_tape=0;
   /* create lock file */
   createPidFile("ts_trisurf",".lock",0);
   parse_args(argv,argc); // sets global variable command_line_args (defined in io.h)
   ts_fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__);
   ts_fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n");
   ts_fprintf(stdout,"Released under terms of GPLv3\n");
   ts_fprintf(stdout,"Starting program...\n\n");
   if(command_line_args.force_from_tape){
//   vesicle = parseDump("timestep_000000.vtu");
//      run_simulation(vesicle, vesicle->tape->mcsweeps, vesicle->tape->inititer, vesicle->tape->iterations, 1);

    if(command_line_args.dump_from_vtk[0]!=0){
      ts_fprintf(stdout,"************************************************\n");
      ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n");
      ts_fprintf(stdout,"************************************************\n\n");
      vesicle = parseDump(command_line_args.dump_from_vtk);
      tape = vesicle->tape;
      int arguments_no;
      FILE *fd=fopen(".status","r");
      if(fd!=NULL){
         arguments_no=fscanf(fd,"%u", &start_iteration);
         if(arguments_no==0){
            ts_fprintf(stdout,"No information of start iteration in .status file");
            }
         fclose(fd);
         start_iteration++;
      }
      else
         ts_fprintf(stdout,"No .status file. The iteration count will start from 0");
/* Here you should read new tape file, reassign some values in vertex from the tape and assign read tape to vesicle->tape */
//        tape=parsetape(command_line_args.tape_fullfilename);
  //      vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
    }
   else 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");