From 1d32b65243c0ad55ae9516acaa349f4f7c823b72 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 18 Sep 2017 18:55:21 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/trilib'

---
 src/energy.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/energy.h b/src/energy.h
index 8a37b85..1b97fa9 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -1,6 +1,11 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _ENERGY_H
 #define _ENERGY_H
 ts_bool mean_curvature_and_energy(ts_vesicle *vesicle);
 inline ts_bool energy_vertex(ts_vertex *vtx);
 inline ts_bool bond_energy(ts_bond *bond,ts_poly *poly);
+
+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);
 #endif

--
Gitblit v1.9.3