From f2719992d437d79af6c9f5d94968552c1750a8d3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 5 Dec 2001 10:17:51 +0000
Subject: [PATCH] fix verb for blackbox builds
---
Box/Main.cpp | 32 ++++++++++++++++----------------
Common/DefaultOptions.h | 4 ----
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/Box/Main.cpp b/Box/Main.cpp
index 073c4a0789..107fe80d71 100644
--- a/Box/Main.cpp
+++ b/Box/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.12 2001-11-19 09:29:18 geuzaine Exp $
+// $Id: Main.cpp,v 1.13 2001-12-05 10:17:51 geuzaine Exp $
#include <signal.h>
#include "ParUtil.h"
@@ -165,7 +165,7 @@ void Msg(int level, char *fmt, ...){
switch(level){
case DIRECT :
- if(ParUtil::Instance()->master())
+ if(CTX.verbosity >=2 && ParUtil::Instance()->master())
vfprintf(stdout, fmt, args); fprintf(stdout, "\n");
break;
@@ -173,7 +173,7 @@ void Msg(int level, char *fmt, ...){
case FATAL1 :
case FATAL2 :
case FATAL3 :
- fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
+ fprintf(stderr,"On processor %d : ", ParUtil::Instance()->rank());
fprintf(stderr, FATAL_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
abort = 1 ;
@@ -183,31 +183,31 @@ void Msg(int level, char *fmt, ...){
case GERROR1 :
case GERROR2 :
case GERROR3 :
- fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
+ fprintf(stderr,"On processor %d : ", ParUtil::Instance()->rank());
fprintf(stderr, ERROR_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
- abort = 1 ;
break ;
case WARNING :
case WARNING1 :
case WARNING2 :
case WARNING3 :
- fprintf(stderr,"On processor %d : ",ParUtil::Instance()->rank());
- fprintf(stderr, WARNING_STR);
- vfprintf(stderr, fmt,args); fprintf(stderr, "\n");
+ if(CTX.verbosity >= 1){
+ fprintf(stderr,"On processor %d : ", ParUtil::Instance()->rank());
+ fprintf(stderr, WARNING_STR);
+ vfprintf(stderr, fmt,args); fprintf(stderr, "\n");
+ }
break;
case PARSER_ERROR :
- if(ParUtil::Instance()->master())
- {
- fprintf(stderr, PARSER_ERROR_STR);
- vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
- }
+ if(ParUtil::Instance()->master()){
+ fprintf(stderr, PARSER_ERROR_STR);
+ vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
+ }
break ;
case PARSER_INFO :
- if(CTX.verbosity == 5 && ParUtil::Instance()->master()){
+ if(CTX.verbosity >= 2 && ParUtil::Instance()->master()){
fprintf(stderr, PARSER_INFO_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
@@ -217,14 +217,14 @@ void Msg(int level, char *fmt, ...){
case DEBUG1 :
case DEBUG2 :
case DEBUG3 :
- if(ParUtil::Instance()->master() && CTX.verbosity > 2){
+ if(CTX.verbosity >= 3 && ParUtil::Instance()->master()){
fprintf(stderr, DEBUG_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
break;
default :
- if(ParUtil::Instance()->master() && CTX.verbosity > 0){
+ if(CTX.verbosity >= 1 && ParUtil::Instance()->master()){
fprintf(stderr, INFO_STR);
vfprintf(stderr, fmt, args); fprintf(stderr, "\n");
}
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index dccd678784..dddb4f2eb7 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -304,11 +304,7 @@ StringXNumber GeneralOptions_Number[] = {
"Z-axis translation (in model units)" },
-#ifdef _BLACKBOX
- { F|O, "Verbosity" , opt_general_verbosity , 0. ,
-#else
{ F|O, "Verbosity" , opt_general_verbosity , 2. ,
-#endif
"Level of information printed during processing (0=no information)" },
{ F|O, "ZoomFactor" , opt_general_zoom_factor , 1.1 ,
--
GitLab