From e818ba5bcc461af545665c78157be4e52252aa1c Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 11 Jul 2016 11:52:30 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

---
 src/tape |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/tape b/src/tape
index 4254270..2e8b8c7 100644
--- a/src/tape
+++ b/src/tape
@@ -1,8 +1,10 @@
 ####### Vesicle definitions ###########
 # nshell is a number of divisions of dipyramid
-nshell=17
+nshell=5
 # 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=10.0
 # max step size (in units l_min)
@@ -12,16 +14,37 @@
 # (pswitch=1: calc. p*dV energy contribution)
 pswitch = 0
 # pressure difference: p_inside - p_outside (in units kT/l_min^3):
-pressure=0.1
+pressure=-10.0
 
-####### Polymer definitions ###########
+#Constant volume constraint (0 disable constant volume, 1 enable wiht additional vertex move, 2 enable with epsvol)
+constvolswitch=0
+constvolprecision=1e-14
+
+#Constant area constraint (0 disable constant area, 2 enable constant area with epsarea)
+constareaswitch=0
+
+####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=300
+npoly=0
 # nmono is a number of monomers in each polymer
-nmono=10
+nmono=2
 # 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=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=0
+R_nucleusY=0
+R_nucleusZ=0
 #######  Cell definitions ############
 nxmax=60
 nymax=60
@@ -30,15 +53,24 @@
 
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
-mcsweeps=500
+#200000
+mcsweeps=200
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
-inititer=1
+#2
+inititer=10
 #how many records do you want on the disk iteration are there in a run?
-iterations=20
+#10000
+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
+ 
+
 
 #what type of multiprocessing? (*none, smp, cluster, distributed, cuda, auto)
 #currently only none makes sense.

--
Gitblit v1.9.3