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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tape b/src/tape
index 734811b..6a54093 100644
--- a/src/tape
+++ b/src/tape
@@ -12,9 +12,9 @@
 
 # Pressure calculations
 # (pswitch=1: calc. p*dV energy contribution)
-pswitch = 1
+pswitch = 0
 # pressure difference: p_inside - p_outside (in units kT/l_min^3):
-pressure=1.0
+pressure=0.0
 
 #Constant volume constraint (0 disable constant volume, 1 enable)
 constvolswitch=0
@@ -49,7 +49,7 @@
 
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
-mcsweeps=2000
+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?

--
Gitblit v1.9.3