From d2f3609e9ecec5ec8dc02a992a6ec98e28ca9c6d Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 27 Feb 2019 18:37:32 +0000
Subject: [PATCH] Merge branch 'master' into plugins
---
src/general.h | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/src/general.h b/src/general.h
index 393eafe..6756149 100644
--- a/src/general.h
+++ b/src/general.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#ifndef _GENERAL_H
#define _GENERAL_H
@@ -155,7 +156,8 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
- struct ts_poly *grafted_poly;
+ struct ts_poly *grafted_poly;
+ struct ts_cluster *cluster;
};
typedef struct ts_vertex ts_vertex;
@@ -193,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;
@@ -248,6 +252,11 @@
typedef struct ts_poly_list ts_poly_list;
+typedef struct{
+ ts_float z_max;
+ ts_float z_min;
+ ts_int force_switch;
+} ts_confinement_plane;
typedef struct {
long int nshell;
@@ -256,12 +265,18 @@
long int nczmax;
long int npoly;
long int nmono;
+ long int internal_poly;
long int nfil;
long int nfono;
long int R_nucleus;
+ ts_double R_nucleusX;
+ ts_double R_nucleusY;
+ ts_double R_nucleusZ;
long int pswitch;
long int constvolswitch;
long int constareaswitch;
+ long int stretchswitch;
+ ts_double xkA0;
ts_double constvolprecision;
char *multiprocessing;
long int brezveze0;
@@ -279,9 +294,47 @@
long int mcsweeps;
long int quiet;
long int shc;
+ long int number_of_vertices_with_c0;
+ ts_double c0;
+ ts_double w;
+ ts_double F;
+ long int plane_confinement_switch;
+ ts_double plane_d;
+ ts_double plane_F;
} ts_tape;
+/* plugins */
+typedef struct {
+ void (*at_start)(void);
+ 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_new_state_accepted)(void *vesicle, ts_vertex *vtx);
+ ts_double (*vm_new_state_rejected)(void *vesicle, ts_vertex *vtx);
+ void (*cleanup)(void);
+} ts_plugin_function;
+
+typedef struct {
+ ts_char *name;
+ ts_char *description;
+ ts_char *author;
+} ts_plugin_details;
+
+typedef struct {
+ ts_plugin_details *details;
+ ts_plugin_function *function;
+ ts_char *filename;
+ void *libhandle;
+} ts_plugin;
+
+typedef struct {
+ ts_uint n;
+ ts_plugin **plugin;
+} ts_plugin_list;
+
+/* end plugins */
typedef struct {
@@ -304,11 +357,31 @@
ts_double spring_constant;
ts_double pressure;
ts_int pswitch;
- ts_tape *tape;
+ ts_tape *tape;
ts_double R_nucleus;
- ts_double area;
+ ts_double R_nucleusX;
+ ts_double R_nucleusY;
+ ts_double R_nucleusZ;
+ ts_double nucleus_center[3];
+ ts_double area;
+ ts_confinement_plane confinement_plane;
+ ts_plugin_list plist;
} ts_vesicle;
+
+
+struct ts_cluster{
+ ts_uint nvtx;
+ ts_uint idx;
+ ts_vertex **vtx;
+};
+
+typedef struct ts_cluster ts_cluster;
+
+typedef struct{
+ ts_uint n;
+ ts_cluster **cluster;
+} ts_cluster_list;
/* GLOBAL VARIABLES */
@@ -338,4 +411,12 @@
#define VTX(n) &(vlist->vtx[n])
#define VTX_DATA(n) vlist->vtx[n].data
+
+/* FOR PID GENERATION ROUTINE */
+#define CPF_CLOEXEC 1
+
+int createPidFile(const char *progName, const char *pidFile, int flags);
+
+int lockRegion(int fd, int type, int whence, int start, int len);
+char *libVersion();
#endif
--
Gitblit v1.9.3