From f039f4c3e44d77456521013030fb3e955e7d9a61 Mon Sep 17 00:00:00 2001
From: Miha <miha.fosnaric@fe.uni-lj.si>
Date: Mon, 25 Mar 2019 09:04:14 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-manager
---
trisurf/wrapper.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/trisurf/wrapper.py b/trisurf/wrapper.py
index 2ed7591..45ddcd7 100644
--- a/trisurf/wrapper.py
+++ b/trisurf/wrapper.py
@@ -82,10 +82,11 @@
('znorm', c_double),
('area', c_double),
('volume', c_double),
+ ('energy', c_double),
]
class ts_triangle_list(Structure):
- _fields_=[('n',c_uint),('tria', POINTER(POINTER(ts_triangle)))]
+ _fields_=[('n',c_uint),('a0',c_double),('tria', POINTER(POINTER(ts_triangle))),]
ts_cell._fields_=[
@@ -145,6 +146,8 @@
('pswitch',c_long),
('constvolswitch',c_long),
('constareaswitch',c_long),
+ ('stretchswitch',c_long),
+ ('xkA0',c_double),
('constvolprecision',c_double),
('multiprocessing',c_char_p),
('brezveze0',c_long),
@@ -282,5 +285,9 @@
ts.cluster_list_free.argtype=[POINTER(ts_cluster_list)]
ts.cluster_list_free(cluster_list)
+def stretchenergy(vesicle, triangle):
+ ts.stretchenergy.argtype=[POINTER(ts_vesicle), POINTER(ts_triangle)]
+ ts.stretchenergy(vesicle,triangle)
+
--
Gitblit v1.9.3