From 36bc6d58f7f1b83ae07c00ce7f42755bedbcff18 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 11 Feb 2019 21:17:55 +0000
Subject: [PATCH] Fixed duplicated stretchswitch and xkA0 while parsing tape
---
src/io.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/io.c b/src/io.c
index 82339cf..30bd4d6 100644
--- a/src/io.c
+++ b/src/io.c
@@ -980,8 +980,10 @@
if(vesicle->tape->stretchswitch==1){
fprintf(fh,"<DataArray type=\"Float64\" Name=\"stretching_energy\" format=\"ascii\">");
- for(i=0;i<blist->n+monono*polyno+filno*(fonono-1)
-;i++){
+ for(i=0;i<blist->n;i++){
+ fprintf(fh, "0.0 ");
+ }
+ for(i=0;i<monono*polyno+filno*(fonono-1);i++){
fprintf(fh,"0.0 ");
}
for(i=0;i<vesicle->tlist->n;i++){
@@ -1203,12 +1205,23 @@
CFG_SIMPLE_FLOAT("c0",&tape->c0),
CFG_SIMPLE_FLOAT("w",&tape->w),
CFG_SIMPLE_FLOAT("F",&tape->F),
+/* Variables related to plane confinement */
+ CFG_INT("plane_confinement_switch", 0, CFGF_NONE),
+ CFG_FLOAT("plane_d", 15, CFGF_NONE),
+ CFG_FLOAT("plane_F", 1000, CFGF_NONE),
+/* Variables related to stretching */
+// CFG_FLOAT("stretchswitch", 0, CFGF_NONE),
+// CFG_FLOAT("xkA0",0,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_getfloat(cfg,"plane_d");
+ tape->plane_F=cfg_getfloat(cfg,"plane_F");
+
if(retval==CFG_FILE_ERROR){
fatal("No tape file.",100);
}
--
Gitblit v1.9.3