From 2a1e3d528265c3d366dab9ad4b0c4d3d65e1c4ed Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Mon, 13 Apr 2020 12:13:50 +0000 Subject: [PATCH] Storing previously debugged version --- src/general.h | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/general.h b/src/general.h index a0e31a5..2dd63d8 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; @@ -217,7 +219,7 @@ ts_cell **cell; ts_double dcell; ts_double shift; - ts_double max_occupancy; + ts_uint max_occupancy; ts_double dmin_interspecies; } ts_cell_list; @@ -250,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; @@ -268,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; @@ -289,6 +298,9 @@ ts_double c0; ts_double w; ts_double F; + long int plane_confinement_switch; + ts_double plane_d; + ts_double plane_F; } ts_tape; @@ -314,13 +326,14 @@ ts_double spring_constant; ts_double pressure; ts_int pswitch; - ts_tape *tape; + ts_tape *tape; ts_double R_nucleus; ts_double R_nucleusX; ts_double R_nucleusY; ts_double R_nucleusZ; ts_double nucleus_center[3]; - ts_double area; + ts_double area; + ts_confinement_plane confinement_plane; } ts_vesicle; -- Gitblit v1.9.3