From 06afc729f9061c1cfa14c78728d61d518324c2f0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 04 May 2022 05:46:43 +0000
Subject: [PATCH] Moved all global variables to separate file and defined extern keyword where appropriate
---
src/general.h | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/general.h b/src/general.h
index 7676000..2f15c50 100644
--- a/src/general.h
+++ b/src/general.h
@@ -158,6 +158,7 @@
ts_double solAngle;
struct ts_poly *grafted_poly;
struct ts_cluster *cluster;
+ ts_double direct_interaction_force;
};
typedef struct ts_vertex ts_vertex;
@@ -219,7 +220,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;
@@ -252,6 +253,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;
@@ -293,6 +299,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;
@@ -318,13 +327,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;
@@ -342,14 +352,6 @@
ts_cluster **cluster;
} ts_cluster_list;
-
-/* GLOBAL VARIABLES */
-
-int quiet;
-ts_double V0;
-ts_double A0;
-ts_double epsvol;
-ts_double epsarea;
/* FUNCTIONS */
/** Non-fatal error function handler:
--
Gitblit v1.9.3