From 9166cbcd0e28d61a69646911af35bb7895ff9203 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Mon, 28 Apr 2014 11:16:45 +0000
Subject: [PATCH] Did major change in vesicle datastructure. Added tape information into vesicle. This means the dump files will be broken each time tape structure changes. Beware.
---
src/general.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/general.h b/src/general.h
index e7e9545..e35310b 100644
--- a/src/general.h
+++ b/src/general.h
@@ -3,7 +3,7 @@
#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
@@ -48,6 +48,8 @@
#define TS_FAIL 1
/* CONSTANTS */
+
+#define TS_ID_FILAMENT 1
/* DATA TYPES */
/** @brief Sets the default datatype for ts_double
@@ -167,10 +169,11 @@
ts_uint idx;
ts_vertex *vtx1;
ts_vertex *vtx2;
- ts_double bond_length;
- ts_double bond_length_dual;
- ts_bool tainted;
+ 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;
@@ -213,12 +216,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;
@@ -244,6 +249,38 @@
+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;
+ long int pswitch;
+ long int constvolswitch;
+ 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;
@@ -257,11 +294,18 @@
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;
- ts_double spring_constant;
-} ts_vesicle;
+// 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_vesicle;
--
Gitblit v1.9.3