From 737e1c8236e7e9b72cf08c5d173e0a307c38600c Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 10 Jul 2012 12:34:47 +0000
Subject: [PATCH] Merge branch 'bondflip'
---
src/io.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/io.c b/src/io.c
index 7421f0d..f993e72 100644
--- a/src/io.c
+++ b/src/io.c
@@ -296,6 +296,8 @@
ts_bool parsetape(ts_vesicle *vesicle,ts_uint *iterations){
long int nshell=17,ncxmax=60, ncymax=60, nczmax=60; // THIS IS DUE TO CONFUSE BUG!
+ char buf[255];
+ long int brezveze=1;
ts_double xk0=25.0, dmax=1.67,stepsize=0.15;
*iterations=1000;
cfg_opt_t opts[] = {
@@ -308,6 +310,10 @@
CFG_SIMPLE_INT("nzmax", &nczmax),
CFG_SIMPLE_INT("iterations",iterations),
CFG_SIMPLE_BOOL("quiet",&quiet),
+ CFG_SIMPLE_STR("multiprocessing",buf),
+ CFG_SIMPLE_INT("smp_cores",&brezveze),
+ CFG_SIMPLE_INT("cluster_nodes",&brezveze),
+ CFG_SIMPLE_INT("distributed_processes",&brezveze),
CFG_END()
};
cfg_t *cfg;
--
Gitblit v1.9.3