Change in mutex location. Now in ts_vertex. Tried to lock cell change. Not ...

Samo Penic

2013-11-24 439a4e0f10dd120b563039012d07eb5f1b3c8ded

 src/io.c

@@ -8,7 +8,7 @@
#include<stdlib.h>
#include <sys/types.h>
#include <dirent.h>

#include "initial_distribution.h"

ts_bool print_vertex_list(ts_vertex_list *vlist){
   ts_uint i;
@@ -294,10 +294,15 @@



ts_bool parsetape(ts_vesicle *vesicle,ts_uint *iterations){
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));
   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;
    *iterations=1000;
   long int iter=1000, init=1000, mcsw=1000;
    cfg_opt_t opts[] = {
        CFG_SIMPLE_INT("nshell", &nshell),
        CFG_SIMPLE_FLOAT("dmax", &dmax),
@@ -306,8 +311,14 @@
        CFG_SIMPLE_INT("nxmax", &ncxmax),
        CFG_SIMPLE_INT("nymax", &ncymax),
        CFG_SIMPLE_INT("nzmax", &nczmax),
        CFG_SIMPLE_INT("iterations",iterations),
        CFG_SIMPLE_INT("iterations",&iter),
   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",&smps),
        CFG_SIMPLE_INT("cluster_nodes",&brezveze1),
        CFG_SIMPLE_INT("distributed_processes",&brezveze2),
        CFG_END()
    };
    cfg_t *cfg;    
@@ -320,6 +331,11 @@
    else if(retval==CFG_PARSE_ERROR){
   fatal("Invalid tape!",100);
   }
   ts_vesicle *vesicle;
       *iterations=iter;
   *inititer=init;
   *mcsweeps=mcsw;
   vesicle=initial_distribution_dipyramid(nshell,ncxmax,ncymax,nczmax,stepsize);
    vesicle->nshell=nshell;
    vesicle->dmax=dmax*dmax;
    vesicle->bending_rigidity=xk0;
@@ -328,9 +344,15 @@
    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);
//    fprintf(stderr,"NSHELL=%u\n",vesicle->nshell);
    return TS_SUCCESS;
   free(buf);
  //  fprintf(stderr,"NSHELL=%u\n",vesicle->nshell);
    return vesicle;

}