From a549778bfece819cf0b599168c571e400e6eb67d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 10 Sep 2014 07:03:15 +0000
Subject: [PATCH] Added calculation of epsV.

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

diff --git a/src/main.c b/src/main.c
index f300719..8a3a550 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,6 +55,9 @@
         free(vesicle->tape);
         vesicle->tape=tape;
 		vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
+
+
+
         /* spherical harmonics */
         if(tape->shc>0){
 	        vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);
@@ -70,6 +73,20 @@
 			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;
 		}
+
+	/* if requested in tape, we can have smaller number of polymeres attached to membrane than the number of polymeres in dump file */
+		if(vesicle->tape->npoly != vesicle->poly_list->n){
+
+		ts_fprintf(stdout,"(INFO) the number of polymeres attached to membrane in tape is different than a number of polymeres in dump file!\n");
+		if(vesicle->tape->npoly > vesicle->poly_list->n){
+			ts_fprintf(stdout,"(INFO) It is possible to decrease the number of polymeres on the membrane, but it is not allowed to increase its number. The maximal allowed number in tape is %d The execution of program will terminate!\n",vesicle->poly_list->n);
+			fatal("Terminating due to increase of number of polymeres",1);
+		} else {
+			remove_random_polymeres(vesicle->poly_list, vesicle->poly_list->n - vesicle->tape->npoly);
+			ts_fprintf(stdout,"(INFO)\n(INFO) The new number of polymeres from tape is %d.\n\n",vesicle->poly_list->n);
+
+		}
+		}
 	}
 
 	run_simulation(vesicle, tape->mcsweeps, tape->inititer, tape->iterations, start_iteration);

--
Gitblit v1.9.3