From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge
---
src/energy.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/energy.c b/src/energy.c
index b4add2a..996fb16 100644
--- a/src/energy.c
+++ b/src/energy.c
@@ -228,7 +228,7 @@
ynorm/=norml;
znorm/=norml;
/*calculate ddp, perpendicular displacement*/
- ddp=xnorm*(vtx->x-vtx_old->x)+xnorm*(vtx->y-vtx_old->y)+znorm*(vtx->z-vtx_old->z);
+ ddp=xnorm*(vtx->x-vtx_old->x)+ynorm*(vtx->y-vtx_old->y)+znorm*(vtx->z-vtx_old->z);
/*calculate dE*/
// printf("ddp=%e",ddp);
return vesicle->tape->F*ddp;
--
Gitblit v1.9.3