From 51b4f09bca802c4941700c78c5733ce968ddc7c6 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Feb 2019 22:44:22 +0000
Subject: [PATCH] An attempt of adding hard constraints plugin to the simulator. It seems it does not work yet
---
src/general.h | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/general.h b/src/general.h
index 50d5a84..d7c1ec7 100644
--- a/src/general.h
+++ b/src/general.h
@@ -195,11 +195,13 @@
ts_double znorm;
ts_double area; // firstly needed for sh.c
ts_double volume; // firstly needed for sh.c
+ ts_double energy;
};
typedef struct ts_triangle ts_triangle;
struct ts_triangle_list{
ts_uint n;
+ ts_double a0;
ts_triangle **tria;
};
typedef struct ts_triangle_list ts_triangle_list;
@@ -273,6 +275,8 @@
long int pswitch;
long int constvolswitch;
long int constareaswitch;
+ long int stretchswitch;
+ ts_double xkA0;
ts_double constvolprecision;
char *multiprocessing;
long int brezveze0;
@@ -302,11 +306,13 @@
/* plugins */
typedef struct {
- void (*at_start)(void);
- void (*after_vesicle_init)(void *vesicle);
+ void (*at_start)(int argc, char **argv);
+ void *(*after_vesicle_init)(void *vesicle);
ts_bool (*vm_hard_constraint)(void *vesicle, ts_vertex *vtx, ts_vertex *odl_vtx);
- ts_double (*vm_energy_before)(void *vesicle, ts_vertex *vtx);
- ts_double (*vm_energy_after)(void *vesicle, ts_vertex *vtx);
+ ts_double (*vm_energy_before_prepare)(void *vesicle, ts_vertex *vtx);
+ ts_double (*vm_energy_before_execute)(void *vesicle, ts_vertex *vtx);
+ ts_double (*vm_energy_after_prepare)(void *vesicle, ts_vertex *vtx);
+ ts_double (*vm_energy_after_execute)(void *vesicle, ts_vertex *vtx);
ts_double (*vm_new_state_accepted)(void *vesicle, ts_vertex *vtx);
ts_double (*vm_new_state_rejected)(void *vesicle, ts_vertex *vtx);
void (*cleanup)(void);
@@ -361,7 +367,7 @@
ts_double nucleus_center[3];
ts_double area;
ts_confinement_plane confinement_plane;
- ts_plugin_list plist;
+ ts_plugin_list *plist;
} ts_vesicle;
--
Gitblit v1.9.3