From 2ae815f58a40d4b86f5183d7e2ec406d5e0f5d65 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 09 May 2018 14:47:15 +0000
Subject: [PATCH] Prepared for stretching
---
src/io.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/io.c b/src/io.c
index c8bdcf8..f513501 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,3 +1,4 @@
+
/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include<stdio.h>
@@ -423,7 +424,7 @@
vesicle->tape=parsetape(command_line_args.tape_fullfilename);
// recreating space for cells //
vesicle->clist=init_cell_list(vesicle->tape->ncxmax, vesicle->tape->ncymax, vesicle->tape->nczmax, vesicle->tape->stepsize);
- vesicle->clist->max_occupancy=8;
+ vesicle->clist->max_occupancy=16;
// vesicle->tape=(ts_tape *)malloc(sizeof(ts_tape));
// retval=fread(vesicle->tape, sizeof(ts_tape),1,fh);
retval=fread(iteration,sizeof(ts_uint),1,fh);
@@ -1164,6 +1165,8 @@
CFG_SIMPLE_INT("constvolswitch",&tape->constvolswitch),
CFG_SIMPLE_INT("constareaswitch",&tape->constareaswitch),
CFG_SIMPLE_FLOAT("constvolprecision",&tape->constvolprecision),
+ CFG_SIMPLE_INT("stretchswitch",&tape->stretchswitch),
+ CFG_SIMPLE_FLOAT("xkA0",&tape->xkA0),
CFG_SIMPLE_FLOAT("pressure",&tape->pressure),
CFG_SIMPLE_FLOAT("k_spring",&tape->kspring),
CFG_SIMPLE_FLOAT("xi",&tape->xi),
@@ -1174,8 +1177,8 @@
CFG_SIMPLE_INT("iterations",&tape->iterations),
CFG_SIMPLE_INT("mcsweeps",&tape->mcsweeps),
CFG_SIMPLE_INT("inititer", &tape->inititer),
- CFG_SIMPLE_BOOL("quiet",&tape->quiet),
- CFG_SIMPLE_STR("multiprocessing",tape->multiprocessing),
+ CFG_SIMPLE_BOOL("quiet",(cfg_bool_t *)&tape->quiet),
+ CFG_SIMPLE_STR("multiprocessing",&tape->multiprocessing),
CFG_SIMPLE_INT("smp_cores",&tape->brezveze0),
CFG_SIMPLE_INT("cluster_nodes",&tape->brezveze1),
CFG_SIMPLE_INT("distributed_processes",&tape->brezveze2),
@@ -1218,6 +1221,8 @@
ts_bool getcmdline_tape(cfg_t *cfg, char *opts){
char *commands, *backup, *saveptr, *saveopptr, *command, *operator[2];
+ operator[0]=0;
+ operator[1]=0;
ts_uint i,j;
commands=(char *)malloc(10000*sizeof(char));
backup=commands; //since the pointer to commands will be lost, we acquire a pointer that will serve as backup.
--
Gitblit v1.9.3