From 1d32b65243c0ad55ae9516acaa349f4f7c823b72 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 18 Sep 2017 18:55:21 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/trilib'

---
 src/tape |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/tape b/src/tape
index 4cd382b..48016a2 100644
--- a/src/tape
+++ b/src/tape
@@ -1,10 +1,6 @@
 ####### 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)
@@ -29,9 +25,9 @@
 
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=800
+npoly=0
 # nmono is a number of monomers in each polymer
-nmono=6
+nmono=10
 # Spring constant between monomers of the polymer
 k_spring=800
 #set to 1 if half of the polymeres are inside the vesicle
@@ -63,7 +59,7 @@
 mcsweeps=2000
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 #2
-inititer=10
+inititer=1
 #how many records do you want on the disk iteration are there in a run?
 #10000
 iterations=100

--
Gitblit v1.9.3