From f6bc99c334f6481e40f547d0e91f771b9564aa38 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 05 Jul 2016 10:09:08 +0000
Subject: [PATCH] Merge branch 'clustercount' into nirgov

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

diff --git a/src/energy.h b/src/energy.h
index e463815..4d51b24 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -4,4 +4,8 @@
 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);
+
 #endif

--
Gitblit v1.9.3