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 |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/tape b/src/tape
index 16a5480..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)
@@ -14,7 +18,7 @@
 # (pswitch=1: calc. p*dV energy contribution)
 pswitch = 0
 # pressure difference: p_inside - p_outside (in units kT/l_min^3):
-pressure=-10.0
+pressure=10.0
 
 #Constant volume constraint (0 disable constant volume, 1 enable wiht additional vertex move, 2 enable with epsvol)
 constvolswitch=0
@@ -25,11 +29,13 @@
 
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=0
+npoly=800
 # nmono is a number of monomers in each polymer
-nmono=2
+nmono=6
 # Spring constant between monomers of the polymer
 k_spring=800
+#set to 1 if half of the polymeres are inside the vesicle
+internal_poly=1
 
 ####### Filament (inside the vesicle) definitions ###########
 # nfil is a number of filaments inside the vesicle
@@ -57,7 +63,7 @@
 mcsweeps=2000
 #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

--
Gitblit v1.9.3