From 487968538b6902a8c102531f5ee60db1c757c219 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 24 Feb 2016 08:52:40 +0000
Subject: [PATCH] Restoration of vertex neighbors completed.
---
src/general.h | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/general.h b/src/general.h
index e47ef1c..393eafe 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,40 @@
+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;
+ 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;
@@ -268,9 +304,9 @@
ts_double spring_constant;
ts_double pressure;
ts_int pswitch;
-
+ ts_tape *tape;
ts_double R_nucleus;
-
+ ts_double area;
} ts_vesicle;
@@ -278,8 +314,10 @@
/* 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