From 3d0247677949505858b0b947fc3b216bb2a7bc80 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 13 May 2016 19:09:59 +0000
Subject: [PATCH] Added many fixes for reruning the simulations, starting from tapes, added Completed status, etc.
---
src/main.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main.c b/src/main.c
index 3407c65..36da13a 100644
--- a/src/main.c
+++ b/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>
@@ -16,6 +17,8 @@
#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
@@ -27,15 +30,31 @@
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");
- parseDump("timestep_000000.vtu");
+// 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,"***** Dumping vesicle from VTK points list *****\n");
+ ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n");
ts_fprintf(stdout,"************************************************\n\n");
- tape=parsetape(command_line_args.tape_fullfilename);
- vesicle=vtk2vesicle(command_line_args.dump_from_vtk,tape);
+ vesicle = parseDump(command_line_args.dump_from_vtk);
+ tape = vesicle->tape;
+ FILE *fd=fopen(".status","r");
+ if(fd!=NULL){
+ fscanf(fd,"%u", &start_iteration);
+ fclose(fd);
+ start_iteration++;
+ }
+/* 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");
--
Gitblit v1.9.3