From 611412f383b15904cb0339e77b2f1f6c29453557 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Fri, 11 Apr 2014 08:06:40 +0000
Subject: [PATCH] Nekaj malega. Ne veva več kaj.

---
 src/main.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main.c b/src/main.c
index 0343378..eef5835 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,12 +38,20 @@
 		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->pswitch =tape->pswitch;
 		vesicle->pressure=tape->pressure;
+		vesicle->dmax=tape->dmax*tape->dmax;
+		poly_assign_filament_xi(vesicle,tape);
+		vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
 
-		if(command_line_args.reset_iteration_count) start_iteration=tape->inititer+1;
+		if(command_line_args.reset_iteration_count) start_iteration=tape->inititer;
 		else start_iteration++;
 
 		if(start_iteration>=tape->iterations){

--
Gitblit v1.9.3