From e6efc61995516174081e923004477e3ff0853515 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 19 Sep 2017 12:35:28 +0000
Subject: [PATCH] Added comments for spontaneous curvature in energy.c and tape

---
 src/tape |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/tape b/src/tape
index 4cd382b..8f38645 100644
--- a/src/tape
+++ b/src/tape
@@ -1,10 +1,6 @@
 ####### Vesicle definitions ###########
 # nshell is a number of divisions of dipyramid
-<<<<<<< HEAD
 nshell=17
-=======
-nshell=10
->>>>>>> nirgov
 # 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)
@@ -29,9 +25,9 @@
 
 ####### Polymer (brush) definitions ###########
 # npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=800
+npoly=0
 # nmono is a number of monomers in each polymer
-nmono=6
+nmono=10
 # Spring constant between monomers of the polymer
 k_spring=800
 #set to 1 if half of the polymeres are inside the vesicle
@@ -63,7 +59,7 @@
 mcsweeps=2000
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 #2
-inititer=10
+inititer=1
 #how many records do you want on the disk iteration are there in a run?
 #10000
 iterations=100
@@ -90,10 +86,9 @@
 #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

--
Gitblit v1.9.3