From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD
---
src/vertexmove.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/vertexmove.c b/src/vertexmove.c
index fb74a06..2517f69 100644
--- a/src/vertexmove.c
+++ b/src/vertexmove.c
@@ -189,6 +189,8 @@
delta_energy+=delta_energy_cv;
// fprintf(stderr,"Denergy after=%e\n",delta_energy);
}
+/* Vertices with spontaneous curvature may have spontaneous force perpendicular to the surface of the vesicle. additional delta energy is calculated in this function */
+ delta_energy+=direct_force_energy(vesicle,vtx,backupvtx);
/* No poly-bond energy for now!
if(vtx->grafted_poly!=NULL){
delta_energy+=
@@ -198,6 +200,7 @@
*/
// fprintf(stderr, "DE=%f\n",delta_energy);
//MONTE CARLOOOOOOOO
+// if(vtx->c!=0.0) printf("DE=%f\n",delta_energy);
if(delta_energy>=0){
#ifdef TS_DOUBLE_DOUBLE
if(exp(-delta_energy)< drand48())
--
Gitblit v1.9.3