From 0634b97e436e480b203a22e1113c473d3ae4d281 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:35:11 +0000
Subject: [PATCH] Merge branch 'nirgov' into HEAD

---
 src/vesicle.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vesicle.h b/src/vesicle.h
index aa7de50..953e0a2 100644
--- a/src/vesicle.h
+++ b/src/vesicle.h
@@ -1,9 +1,11 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _VESICLE_H
 #define _VESICLE_H
 
 ts_vesicle *init_vesicle(ts_uint N, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize);
 ts_bool vesicle_translate(ts_vesicle *vesicle,ts_double x, ts_double y, ts_double z);
 ts_bool vesicle_free(ts_vesicle *vesicle);
-
-
+ts_bool vesicle_volume(ts_vesicle *vesicle);
+ts_bool vesicle_area(ts_vesicle *vesicle);
+ts_double vesicle_meancurvature(ts_vesicle *vesicle);
 #endif

--
Gitblit v1.9.3