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 |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/tape b/src/tape
index 4fd57e5..2e8b8c7 100644
--- a/src/tape
+++ b/src/tape
@@ -14,20 +14,20 @@
 # (pswitch=1: calc. p*dV energy contribution)
 pswitch = 0
 # pressure difference: p_inside - p_outside (in units kT/l_min^3):
-pressure=0.0
+pressure=-10.0
 
 #Constant volume constraint (0 disable constant volume, 1 enable wiht additional vertex move, 2 enable with epsvol)
-constvolswitch=2
+constvolswitch=0
 constvolprecision=1e-14
 
 #Constant area constraint (0 disable constant area, 2 enable constant area with epsarea)
-constareaswitch=2
+constareaswitch=0
 
 ####### 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
+nmono=2
 # Spring constant between monomers of the polymer
 k_spring=800
 
@@ -35,14 +35,16 @@
 # nfil is a number of filaments inside the vesicle
 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=0
+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
@@ -52,10 +54,10 @@
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
 #200000
-mcsweeps=20
+mcsweeps=200
 #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
@@ -67,6 +69,8 @@
 
 #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