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 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/energy.h b/src/energy.h
index 90463d8..9d1f47c 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -1,5 +1,13 @@
+/* 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);
+
+void stretchenergy(ts_vesicle *vesicle, ts_triangle *triangle);
 #endif

--
Gitblit v1.9.3