From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/tape |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/tape b/src/tape
index 18eea15..6a54093 100644
--- a/src/tape
+++ b/src/tape
@@ -3,24 +3,43 @@
 nshell=17
 # 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)
+dmin_interspecies=1.2
 # bending rigidity of the membrane (in units kT)
-xk0=1.0
+xk0=10.0
 # max step size (in units l_min)
 stepsize=0.15
 
 # Pressure calculations
 # (pswitch=1: calc. p*dV energy contribution)
 pswitch = 0
-# pressure difference: p_inside - p_outside (in units l_min^3/kT):
+# pressure difference: p_inside - p_outside (in units kT/l_min^3):
 pressure=0.0
 
-####### Polymer definitions ###########
+#Constant volume constraint (0 disable constant volume, 1 enable)
+constvolswitch=0
+constvolprecision=1e-14
+
+
+####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
 npoly=0
 # nmono is a number of monomers in each polymer
 nmono=10
 # Spring constant between monomers of the polymer
 k_spring=800
+
+####### Filament (inside the vesicle) definitions ###########
+# nfil is a number of filaments inside the vesicle
+nfil=0
+# nfono is a number of monomers in each filament
+nfono=300
+# Persistence lenght of the filaments (in units l_min)
+xi=0
+
+####### Nucleus (inside the vesicle) ###########
+# Radius of an impenetrable hard sphere inside the vesicle
+R_nucleus=0
 
 #######  Cell definitions ############
 nxmax=60
@@ -30,13 +49,17 @@
 
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
-mcsweeps=500
+mcsweeps=200
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
-inititer=1
+inititer=0
 #how many records do you want on the disk iteration are there in a run?
-iterations=10
+iterations=100
 
 
+###### Spherical harmonics ###########
+# If 0 then spherical harmonics are not calculated at all.
+spherical_harmonics_coefficients=21
+
 #shut up if we are using cluster!!!
 quiet=false
 

--
Gitblit v1.9.3