do not print progress bar by default, still causing hanging on certai…

…n gpu
fangq · Jul 26, 2019 · eedf008 · eedf008
1 parent 881ae8c
commit eedf008
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mcxlabcl/mcxlabcl.m b/mcxlabcl/mcxlabcl.m
@@ -214,7 +214,7 @@
 % cfg.debuglevel: debug flag string (case insensitive), one or a combination of ['R','M','P'], no space
 % 'R': debug RNG, output fluence.data is filled with 0-1 random numbers
 % 'M': return photon trajectory data as the 5th output
-% 'P': show progress bar - default
+% 'P': show progress bar
 % cfg.maxjumpdebug: [10000000|int] when trajectory is requested in the output, 
 % use this parameter to set the maximum position stored. By default,
 % only the first 1e6 positions are stored.

diff --git a/src/mcx_utils.c b/src/mcx_utils.c
@@ -233,7 +233,7 @@ void mcx_initcfg(Config *cfg){
  cfg->energyabs=0.f;
  cfg->energyesc=0.f;
  cfg->runtime=0;
- cfg->debuglevel=4;
+ cfg->debuglevel=0;
  cfg->gpuid=0;
 
  memset(cfg->bc,0,8);
@@ -1230,7 +1230,7 @@ int mcx_loadjson(cJSON *root, Config *cfg){
  if(!flagset['A']) cfg->autopilot=FIND_JSON_KEY("DoAutoThread","Session.DoAutoThread",Session,cfg->autopilot,valueint);
  if(!flagset['m']) cfg->ismomentum=FIND_JSON_KEY("DoDCS","Session.DoDCS",Session,cfg->ismomentum,valueint);
  if(!flagset['V']) cfg->isspecular=FIND_JSON_KEY("DoSpecular","Session.DoSpecular",Session,cfg->isspecular,valueint);
- if(!flagset['D']) cfg->debuglevel=mcx_parsedebugopt(FIND_JSON_KEY("DebugFlag","Session.DebugFlag",Session,"P",valuestring),debugflag);
+ if(!flagset['D']) cfg->debuglevel=mcx_parsedebugopt(FIND_JSON_KEY("DebugFlag","Session.DebugFlag",Session,"",valuestring),debugflag);
  cfg->savedetflag=mcx_parsedebugopt(FIND_JSON_KEY("SaveDataMask","Session.SaveDataMask",Session,"",valuestring),saveflag);
 
  if(!cfg->outputformat) cfg->outputformat=mcx_keylookup((char *)FIND_JSON_KEY("OutputFormat","Session.OutputFormat",Session,"mc2",valuestring),outputformat);
@@ -2154,9 +2154,9 @@ where possible parameters include (the first value in [*|*] is the default)\n\
  -i (--interactive) interactive mode\n\
 \n"S_BOLD S_CYAN"\
 == Debug options ==\n"S_RESET"\
- -D [4|int] (--debug) print debug information (you can use an integer\n\
+ -D [0|int] (--debug) print debug information (you can use an integer\n\
  or or a string by combining the following flags)\n\
- -D ['P'|RMP] 1 R debug RNG\n\
+ -D [''|RMP]  1 R debug RNG\n\
  /case insensitive/ 2 M store photon trajectory info\n\
  4 P print progress bar\n\
  combine multiple items by using a string, or add selected numbers together\n\