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/energy.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/energy.h b/src/energy.h
index 4d51b24..9d1f47c 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -7,5 +7,7 @@
 
 ts_bool sweep_attraction_bond_energy(ts_vesicle *vesicle);
 inline ts_bool attraction_bond_energy(ts_bond *bond, ts_double w);
+ts_double direct_force_energy(ts_vesicle *vesicle, ts_vertex *vtx, ts_vertex *vtx_old);
 
+void stretchenergy(ts_vesicle *vesicle, ts_triangle *triangle);
 #endif

--
Gitblit v1.9.3