From bbe7df469c40beb309542c01f25c262340978629 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Thu, 15 Sep 2016 08:04:34 +0000
Subject: [PATCH] Merge branch 'pegs'
---
src/general.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/general.h b/src/general.h
index 547680e..4eab674 100644
--- a/src/general.h
+++ b/src/general.h
@@ -257,9 +257,13 @@
long int nczmax;
long int npoly;
long int nmono;
+ long int internal_poly;
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;
@@ -307,6 +311,10 @@
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;
--
Gitblit v1.9.3