From 8e345370c7846bb5592fb639a6ff91a8abbeef00 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 10 Jul 2016 18:44:43 +0000
Subject: [PATCH] Saving all the differences
---
src/general.h | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 17 deletions(-)
diff --git a/src/general.h b/src/general.h
index 6263862..a6f5114 100644
--- a/src/general.h
+++ b/src/general.h
@@ -1,17 +1,19 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
#ifndef _GENERAL_H
#define _GENERAL_H
#include<stdarg.h>
#include<stdio.h>
-
+#include<gsl/gsl_complex.h>
/* @brief This is a header file, defining general constants and structures.
* @file header.h
* @author Samo Penic
* @date 5.3.2001
- *
+ *
* Header file for general inclusion in all the code, defining data structures
* and general constans. All datatypes used in the code is also defined here.
*
+ * Miha: branch trisurf-polyel
*/
/* Defines */
@@ -47,6 +49,8 @@
#define TS_FAIL 1
/* CONSTANTS */
+
+#define TS_ID_FILAMENT 1
/* DATA TYPES */
/** @brief Sets the default datatype for ts_double
@@ -125,8 +129,6 @@
ts_uint coord_type;
} ts_coord;
-
-
/** @brief Data structure of all data connected to a vertex
*
* ts_vertex holds the data for one single point (bead, vertex). To understand how to use it
@@ -154,6 +156,7 @@
ts_double projArea;
ts_double relR;
ts_double solAngle;
+ struct ts_poly *grafted_poly;
};
typedef struct ts_vertex ts_vertex;
@@ -164,11 +167,14 @@
} ts_vertex_list;
struct ts_bond {
- ts_uint idx;
+ ts_uint idx;
ts_vertex *vtx1;
ts_vertex *vtx2;
- ts_double bond_length;
- ts_double bond_length_dual;
+ ts_double bond_length;
+ ts_double bond_length_dual;
+ ts_bool tainted; //TODO: remove
+ ts_double energy;
+ ts_double x,y,z;
};
typedef struct ts_bond ts_bond;
@@ -211,12 +217,14 @@
ts_double dcell;
ts_double shift;
ts_double max_occupancy;
+ ts_double dmin_interspecies;
} ts_cell_list;
typedef struct {
ts_uint l;
ts_double **ulm;
+ gsl_complex **ulmComplex;
ts_double **sumUlm2;
ts_uint N;
ts_double **co;
@@ -225,28 +233,99 @@
+struct ts_poly {
+ ts_vertex_list *vlist;
+ ts_bond_list *blist;
+ ts_vertex *grafted_vtx;
+ ts_double k;
+};
+typedef struct ts_poly ts_poly;
+
+
+struct ts_poly_list {
+ ts_uint n;
+ ts_poly **poly;
+};
+typedef struct ts_poly_list ts_poly_list;
+
+
+
+typedef struct {
+ long int nshell;
+ long int ncxmax;
+ long int ncymax;
+ long int nczmax;
+ long int npoly;
+ long int nmono;
+ 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;
+ ts_double constvolprecision;
+ char *multiprocessing;
+ long int brezveze0;
+ long int brezveze1;
+ long int brezveze2;
+ ts_double xk0;
+ ts_double dmax;
+ ts_double dmin_interspecies;
+ ts_double stepsize;
+ ts_double kspring;
+ ts_double xi;
+ ts_double pressure;
+ long int iterations;
+ long int inititer;
+ long int mcsweeps;
+ long int quiet;
+ long int shc;
+} ts_tape;
+
+
+
+
typedef struct {
ts_vertex_list *vlist;
ts_bond_list *blist;
ts_triangle_list *tlist;
- ts_cell_list *clist;
+ ts_cell_list *clist;
ts_uint nshell;
- ts_double bending_rigidity;
- ts_double dmax;
- ts_double stepsize;
- ts_double cm[3];
- ts_double volume;
- ts_spharm *sphHarmonics;
-} ts_vesicle;
+ ts_double bending_rigidity;
+ ts_double dmax;
+ ts_double stepsize;
+ ts_double cm[3];
+ ts_double volume;
+ ts_spharm *sphHarmonics;
+// Polymers outside the vesicle and attached to the vesicle membrane (polymer brush):
+ ts_poly_list *poly_list;
+// Filaments inside the vesicle (not attached to the vesicel membrane:
+ ts_poly_list *filament_list;
+ ts_double spring_constant;
+ ts_double pressure;
+ ts_int pswitch;
+ 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_vesicle;
/* GLOBAL VARIABLES */
int quiet;
-
-
+ts_double V0;
+ts_double A0;
+ts_double epsvol;
+ts_double epsarea;
/* FUNCTIONS */
/** Non-fatal error function handler:
@@ -267,4 +346,11 @@
#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);
#endif
--
Gitblit v1.9.3