From 514ebcb0e1b01fa41d022e3a92fe08a390a421dd Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 09 Dec 2018 21:35:42 +0000
Subject: [PATCH] Load settings from tape
---
src/io.c | 7 +++++++
src/tape | 11 ++++++++++-
src/general.h | 13 +++++++++++--
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/general.h b/src/general.h
index a0e31a5..c530a68 100644
--- a/src/general.h
+++ b/src/general.h
@@ -250,6 +250,11 @@
typedef struct ts_poly_list ts_poly_list;
+typedef struct{
+ ts_float z_max;
+ ts_float z_min;
+ ts_int force_switch;
+} ts_confinement_plane;
typedef struct {
long int nshell;
@@ -289,6 +294,9 @@
ts_double c0;
ts_double w;
ts_double F;
+ long int plane_confinement_switch;
+ ts_double plane_d;
+ ts_double plane_F;
} ts_tape;
@@ -314,13 +322,14 @@
ts_double spring_constant;
ts_double pressure;
ts_int pswitch;
- ts_tape *tape;
+ 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_double area;
+ ts_confinement_plane confinement_plane;
} ts_vesicle;
diff --git a/src/io.c b/src/io.c
index 5a5e9a2..669a4b0 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1185,12 +1185,19 @@
CFG_SIMPLE_FLOAT("c0",&tape->c0),
CFG_SIMPLE_FLOAT("w",&tape->w),
CFG_SIMPLE_FLOAT("F",&tape->F),
+ CFG_INT("plane_confinement_switch", 0, CFGF_NONE),
+ CFG_FLOAT("plane_d", 15, CFGF_NONE),
+ CFG_FLOAT("plane_F", 1000, CFGF_NONE),
CFG_END()
};
cfg_t *cfg;
ts_uint retval;
cfg = cfg_init(opts, 0);
retval=cfg_parse_buf(cfg, buffer);
+ tape->plane_confinement_switch=cfg_getint(cfg,"plane_confinement_switch");
+ tape->plane_d=cfg_getint(cfg,"plane_d");
+ tape->plane_F=cfg_getint(cfg,"plane_F");
+
if(retval==CFG_FILE_ERROR){
fatal("No tape file.",100);
}
diff --git a/src/tape b/src/tape
index 8f38645..cb09003 100644
--- a/src/tape
+++ b/src/tape
@@ -59,7 +59,7 @@
mcsweeps=2000
#how many initial mcsweeps*inititer MC sweeps before recording to disk?
#2
-inititer=1
+inititer=0
#how many records do you want on the disk iteration are there in a run?
#10000
iterations=100
@@ -94,3 +94,12 @@
w=10.0
#direct force on vesicles with spontaneous curvature (float)
F=2.0
+
+
+
+#plane confinement
+plane_confinement_switch=1
+#final plane distance (float in lmin)
+plane_d=15
+#plane to vesicle repulsion force while closing
+plane_F=1000
--
Gitblit v1.9.3