From 3de2893d882d2c407375146376fbf9bb54f33e8b Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 30 Apr 2014 13:44:12 +0000
Subject: [PATCH] Constant volume works. CAVEAT: in centermass I had to recalculate all normals of triangles again! This could influence behaviour of the system.

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

diff --git a/src/general.h b/src/general.h
index e47ef1c..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
@@ -222,6 +223,7 @@
 typedef struct {
     ts_uint l;
     ts_double **ulm;
+    gsl_complex **ulmComplex;
     ts_double **sumUlm2;
     ts_uint N;
     ts_double **co;
@@ -247,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;
@@ -268,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