From c60a49ec71004bad2af9ca8b3240c035a7ab8d2a Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 03 Jun 2014 10:04:57 +0000
Subject: [PATCH] Added random seed.

---
 src/general.h |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/src/general.h b/src/general.h
index 79da2ba..3238245 100644
--- a/src/general.h
+++ b/src/general.h
@@ -3,6 +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
@@ -47,6 +48,8 @@
 #define TS_FAIL 1
 
 /* CONSTANTS */
+
+#define TS_ID_FILAMENT 1
 
 /* DATA TYPES */
 /** @brief Sets the default datatype for ts_double
@@ -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,39 @@
 
 
 
+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;
+    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;
@@ -265,7 +303,7 @@
 	ts_double spring_constant;
 	ts_double pressure;
 	ts_int pswitch;
-
+    ts_tape *tape;
 	ts_double R_nucleus;
 
 } ts_vesicle;

--
Gitblit v1.9.3