From 50f10f120936a429dc450f58a40951fa5d59458a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 23 Nov 2013 21:11:15 +0000
Subject: [PATCH] Somewhat evolved paralelism.
---
src/io.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/io.c b/src/io.c
index 9e278ec..4a36f88 100644
--- a/src/io.c
+++ b/src/io.c
@@ -297,7 +297,8 @@
ts_vesicle *parsetape(ts_uint *mcsweeps, ts_uint *inititer, ts_uint *iterations){
long int nshell=17,ncxmax=60, ncymax=60, nczmax=60; // THIS IS DUE TO CONFUSE BUG!
char *buf=malloc(255*sizeof(char));
- long int brezveze0=1;
+ buf[0]=0;
+ long int smps=1;
long int brezveze1=1;
long int brezveze2=1;
ts_double xk0=25.0, dmax=1.67,stepsize=0.15;
@@ -314,8 +315,8 @@
CFG_SIMPLE_INT("mcsweeps",&mcsw),
CFG_SIMPLE_INT("inititer", &init),
CFG_SIMPLE_BOOL("quiet",&quiet),
- CFG_SIMPLE_STR("multiprocessing",buf),
- CFG_SIMPLE_INT("smp_cores",&brezveze0),
+ CFG_SIMPLE_STR("multiprocessing",&buf),
+ CFG_SIMPLE_INT("smp_cores",&smps),
CFG_SIMPLE_INT("cluster_nodes",&brezveze1),
CFG_SIMPLE_INT("distributed_processes",&brezveze2),
CFG_END()
@@ -343,7 +344,11 @@
vesicle->clist->ncmax[1]=ncymax;
vesicle->clist->ncmax[2]=nczmax;
vesicle->clist->max_occupancy=8;
-
+ if(strcmp(buf,"smp")==0){
+ vesicle->threads=smps;
+ } else {
+ vesicle->threads=1;
+ }
cfg_free(cfg);
free(buf);
// fprintf(stderr,"NSHELL=%u\n",vesicle->nshell);
--
Gitblit v1.9.3