From d5d78a49c6b51fb1f6f0661d063034eaf65e02f7 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 25 Sep 2019 09:20:36 +0000
Subject: [PATCH] Constant volume and constant area fix. Removed spherical harmonics calculations in simulations. No ulm2.cvs and state.dat files are produced anymore
---
src/vesicle.c | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/vesicle.c b/src/vesicle.c
index 43b16b5..fe4c4b1 100644
--- a/src/vesicle.c
+++ b/src/vesicle.c
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include<general.h>
#include "vesicle.h"
#include "vertex.h"
@@ -6,6 +7,8 @@
#include "cell.h"
#include "stdlib.h"
#include "poly.h"
+#include "sh.h"
+#include "shcomplex.h"
ts_vesicle *init_vesicle(ts_uint N, ts_uint ncmax1, ts_uint ncmax2, ts_uint
ncmax3, ts_double stepsize){
@@ -35,6 +38,8 @@
triangle_list_free(vesicle->tlist);
cell_list_free(vesicle->clist);
poly_list_free(vesicle->poly_list);
+ poly_list_free(vesicle->filament_list);
+ complex_sph_free(vesicle->sphHarmonics);
free(vesicle);
return TS_SUCCESS;
}
@@ -57,3 +62,32 @@
vesicle->volume=volume;
return TS_SUCCESS;
}
+
+/* @brief Function makes a sum of partial areas of each triangle.
+ *
+ *
+ *
+ */
+ts_bool vesicle_area(ts_vesicle *vesicle){
+ ts_double area;
+ ts_uint i;
+ ts_triangle **tria=vesicle->tlist->tria;
+ area=0;
+ for(i=0;i<vesicle->tlist->n;i++){
+ area=area+tria[i]->area;
+ }
+ vesicle->area=area;
+ return TS_SUCCESS;
+}
+
+ts_double vesicle_meancurvature(ts_vesicle *vesicle){
+// Integrates (H dA) over vesicle area A, where H=(C1+C2)/2.
+// (To be devided by A outside of function)
+ ts_double mc;
+ ts_uint i;
+ mc=0;
+ for(i=0;i<vesicle->vlist->n;i++){
+ mc=mc+vesicle->vlist->vtx[i]->curvature;
+ }
+ return mc/2.0;
+}
--
Gitblit v1.9.3