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

---
 python/tape |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/tape b/python/tape
index baaac60..35b52e6 100644
--- a/python/tape
+++ b/python/tape
@@ -1,6 +1,6 @@
 ####### Vesicle definitions ###########
 # nshell is a number of divisions of dipyramid
-nshell=5
+nshell=10
 # 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)
@@ -17,15 +17,15 @@
 pressure=0.0
 
 #Constant volume constraint (0 disable constant volume, 1 enable wiht additional vertex move, 2 enable with epsvol)
-constvolswitch=2
+constvolswitch=0
 constvolprecision=1e-14
 
 #Constant area constraint (0 disable constant area, 2 enable constant area with epsarea)
-constareaswitch=2
+constareaswitch=0
 
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=2
+npoly=60
 # nmono is a number of monomers in each polymer
 nmono=10
 # Spring constant between monomers of the polymer
@@ -52,10 +52,10 @@
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
 #200000
-mcsweeps=20
+mcsweeps=200
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 #2
-inititer=0
+inititer=10
 #how many records do you want on the disk iteration are there in a run?
 #10000
 iterations=100
@@ -63,7 +63,7 @@
 
 ###### Spherical harmonics ###########
 # If 0 then spherical harmonics are not calculated at all.
-spherical_harmonics_coefficients=21
+spherical_harmonics_coefficients=0
 
 #shut up if we are using cluster!!!
 quiet=false

--
Gitblit v1.9.3