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

diff --git a/src/tape b/src/tape
index 0801375..6a54093 100644
--- a/src/tape
+++ b/src/tape
@@ -16,6 +16,11 @@
 # pressure difference: p_inside - p_outside (in units kT/l_min^3):
 pressure=0.0
 
+#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
@@ -44,14 +49,15 @@
 
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
-mcsweeps=2500
+mcsweeps=200
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 inititer=0
 #how many records do you want on the disk iteration are there in a run?
-iterations=15000
+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!!!

--
Gitblit v1.9.3