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 | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/trisurf/wrapper.py b/trisurf/wrapper.py
index 35d0405..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),
@@ -199,7 +202,7 @@
ts_cluster._fields_=[('nvtx',c_uint),('idx',c_uint),('vtx', POINTER(POINTER(ts_vertex)))]
class ts_cluster_list(Structure):
- _fields_=[('n',c_uint),('poly',POINTER(POINTER(ts_cluster)))]
+ _fields_=[('n',c_uint),('cluster',POINTER(POINTER(ts_cluster)))]
@@ -247,5 +250,44 @@
ts.vesicle_free.argtype=[POINTER(ts_vesicle)]
ts.vesicle_free(vesicle)
+def vesicle_volume(vesicle):
+ ts.vesicle_volume.argtype=[POINTER(ts_vesicle)]
+ ts.vesicle_volume(vesicle)
+def vesicle_area(vesicle):
+ ts.vesicle_area.argtype=[POINTER(ts_vesicle)]
+ ts.vesicle_area(vesicle)
+def gyration_eigen(vesicle):
+ ts.gyration_eigen.argtype=[POINTER(ts_vesicle), POINTER(c_double), POINTER(c_double), POINTER(c_double)]
+ l1=c_double(0.0)
+ l2=c_double(0.0)
+ l3=c_double(0.0)
+ ts.gyration_eigen(vesicle , byref(l1), byref(l2), byref(l3))
+ return (l1.value, l2.value, l3.value)
+
+def vesicle_meancurvature(vesicle):
+ ts.vesicle_meancurvature.argtype=[POINTER(ts_vesicle)]
+ ts.vesicle_meancurvature.restype=c_double
+ return ts.vesicle_meancurvature(vesicle)
+
+def init_cluster_list():
+ ts.init_cluster_list.restype=POINTER(ts_cluster_list)
+ ret=ts.init_cluster_list()
+ return ret
+
+def clusterize_vesicle(vesicle, cluster_list):
+ ts.clusterize_vesicle.argtype=[POINTER(ts_vesicle), POINTER(ts_cluster_list)]
+ ts.clusterize_vesicle(vesicle, cluster_list)
+
+def cluster_list_free(cluster_list):
+ """Free memory of cluster list"""
+ 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