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

diff --git a/src/tape b/src/tape
index 0fb355e..bad3739 100644
--- a/src/tape
+++ b/src/tape
@@ -14,7 +14,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,26 +25,28 @@
 
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=3
+npoly=800
 # nmono is a number of monomers in each polymer
-nmono=10
+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
-nfil=2
+nfil=0
 # nfono is a number of monomers in each filament
-nfono=300
+nfono=3
 # Persistence lenght of the filaments (in units l_min)
 xi=100
 
 ####### Nucleus (inside the vesicle) ###########
 # Radius of an impenetrable hard sphere inside the vesicle
 R_nucleus=0
-R_nucleusX=6.0
-R_nucleusY=12.0
-R_nucleusZ=6.0
+R_nucleusX=0
+R_nucleusY=0
+R_nucleusZ=0
 #######  Cell definitions ############
 nxmax=60
 nymax=60
@@ -57,7 +59,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
@@ -86,9 +88,10 @@
 
 #NirGov branch only!
 #number of vertices with spontaneous curvature (integer)
-number_of_vertices_with_c0=300
+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