From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge

---
 src/tape |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/tape b/src/tape
index 69fd056..bad3739 100644
--- a/src/tape
+++ b/src/tape
@@ -39,7 +39,7 @@
 # nfono is a number of monomers in each filament
 nfono=3
 # Persistence lenght of the filaments (in units l_min)
-xi=0
+xi=100
 
 ####### Nucleus (inside the vesicle) ###########
 # Radius of an impenetrable hard sphere inside the vesicle
@@ -56,7 +56,7 @@
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
 #200000
-mcsweeps=200
+mcsweeps=2000
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 #2
 inititer=10
@@ -71,6 +71,8 @@
 
 #shut up if we are using cluster!!!
 quiet=false
+ 
+
 
 #what type of multiprocessing? (*none, smp, cluster, distributed, cuda, auto)
 #currently only none makes sense.
@@ -82,3 +84,14 @@
 #max number of processes in distributed (voluntary) environment
 distributed_processes=50
 #cuda options???
+
+
+#NirGov branch only!
+#number of vertices with spontaneous curvature (integer)
+number_of_vertices_with_c0=100
+#spontaneous curvature (float)
+c0=0.5
+#energy of attraction of vertices with spontaneous curvature (float, positive value for attraction)
+w=10.0
+#direct force on vesicles with spontaneous curvature (float)
+F=2.0

--
Gitblit v1.9.3