From 4019ca8157136a68b6e43b31f166dc93acd81b4d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 08 Feb 2019 08:14:57 +0000
Subject: [PATCH] Merge branch 'stretching-devel' into plane-new

---
 src/tape |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/tape b/src/tape
index 48016a2..5e1be37 100644
--- a/src/tape
+++ b/src/tape
@@ -23,6 +23,11 @@
 #Constant area constraint (0 disable constant area, 2 enable constant area with epsarea)
 constareaswitch=0
 
+
+#Stretching
+stretchswitch=1
+xkA0=1.0
+
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
 npoly=0
@@ -56,10 +61,10 @@
 ####### Program Control ############
 #how many MC sweeps between subsequent records of states to disk
 #200000
-mcsweeps=2000
+mcsweeps=200
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 #2
-inititer=1
+inititer=0
 #how many records do you want on the disk iteration are there in a run?
 #10000
 iterations=100
@@ -86,12 +91,20 @@
 #cuda options???
 
 
-#NirGov branch only!
 #number of vertices with spontaneous curvature (integer)
 number_of_vertices_with_c0=100
-#spontaneous curvature (float)
+#c0/2 is spontaneous curvature. c0 is used as (c1+c1-c0)^2 in energy term (float)
 c0=0.5
 #energy of attraction of vertices with spontaneous curvature (float, positive value for attraction)
 w=10.0
 #direct force on vesicles with spontaneous curvature (float)
 F=2.0
+
+
+
+#plane confinement
+plane_confinement_switch=1
+#final plane distance (float in lmin)
+plane_d=10
+#plane to vesicle repulsion force while closing
+plane_F=10

--
Gitblit v1.9.3