From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

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

diff --git a/src/tape b/src/tape
index a7baa73..4cd382b 100644
--- a/src/tape
+++ b/src/tape
@@ -1,6 +1,10 @@
 ####### Vesicle definitions ###########
 # nshell is a number of divisions of dipyramid
+<<<<<<< HEAD
 nshell=17
+=======
+nshell=10
+>>>>>>> nirgov
 # dmax is the max. bond length (in units l_min)
 dmax=1.7
 # dmin_interspecies in the min. dist. between different vertex species (in units l_min)
@@ -56,7 +60,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
@@ -84,3 +88,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