From def8b5262e183297ccee42ebbf9ebdb89c10f44c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 03 Jul 2016 18:21:13 +0000
Subject: [PATCH] restoring vertices with spontaneous curvatures seems to work, however, the dumped energy differs on last few decimal places

---
 src/general.h |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/general.h b/src/general.h
index e35310b..31de50a 100644
--- a/src/general.h
+++ b/src/general.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _GENERAL_H
 #define _GENERAL_H
 
@@ -259,8 +260,13 @@
 	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;
+    ts_double constvolprecision;
     	char *multiprocessing;
    	long int brezveze0;
     	long int brezveze1;
@@ -277,6 +283,9 @@
 	long int mcsweeps;
 	long int quiet;
 	long int shc;
+	long int number_of_vertices_with_c0;
+	ts_double c0;
+	ts_double w;
 } ts_tape;
 
 
@@ -304,7 +313,11 @@
 	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;
 
 
@@ -312,8 +325,10 @@
 /* GLOBAL VARIABLES */
 
 int quiet;
-
-
+ts_double V0;
+ts_double A0;
+ts_double epsvol;
+ts_double epsarea;
 /* FUNCTIONS */
 
 /** Non-fatal error function handler:
@@ -334,4 +349,11 @@
 #define VTX(n) &(vlist->vtx[n])
 #define VTX_DATA(n) vlist->vtx[n].data
 
+
+/* FOR PID GENERATION ROUTINE */
+#define CPF_CLOEXEC 1
+
+int createPidFile(const char *progName, const char *pidFile, int flags);
+
+int lockRegion(int fd, int type, int whence, int start, int len);
 #endif

--
Gitblit v1.9.3