From 1d12c9ea1d45b80d0cabdbc6bf696585e2f85de6 Mon Sep 17 00:00:00 2001
From: Baptiste LENIAU <baptiste.leniau@subatech.in2p3.fr>
Date: Mon, 31 Aug 2015 12:01:17 +0000
Subject: [PATCH] Add a prettier terminal output when running CLASS. To use the
old output use SetSoberTerminalOutput()
git-svn-id: svn+ssh://svn.in2p3.fr/class@724 0e7d625b-0364-4367-a6be-d5be4a48d228
---
source/branches/BaM_Dev/include/Scenario.hxx | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/source/branches/BaM_Dev/include/Scenario.hxx b/source/branches/BaM_Dev/include/Scenario.hxx
index 1b1509d2d..591d94ab5 100755
--- a/source/branches/BaM_Dev/include/Scenario.hxx
+++ b/source/branches/BaM_Dev/include/Scenario.hxx
@@ -243,9 +243,13 @@ class Scenario : public CLASSObject
*/
//@{
-
+ void PrintCLASSPresentation(); //!< CLASS informations when first running the code
+ void PrintClover(int i); //!< Print a nuclear clover for progression
+
void ProgressPrintout(cSecond t); //!< Update the prompt output to the time t
-
+ void OldProgressPrintout(cSecond t); //!< Update the prompt output to the time t (without nuclear clover)
+ void SetSoberTerminalOutput(){fOldProgressBar = true;} //!< Dont display animated nuclear clover in terminal
+
void Print(); //!< Print some information about the Parc
void Write(); //!< Write information in a file
@@ -264,7 +268,8 @@ class Scenario : public CLASSObject
bool fNewTtree; //!< Tru if we want to define a new TTree in the output File
bool fStockManagement; ///< True if real StockManagement false unstead (Default = true)
bool fLogTimeStep;
-
+ bool fOldProgressBar; ///< if set to true : no nuclear clover are drawn in terminal
+
cSecond fPrintStep; ///< Time interval between two output update in [s]
cSecond fAbsoluteTime; ///< Absolute Clock in [s]
cSecond fStartingTime; ///< Starting Time in [s]
@@ -275,8 +280,8 @@ class Scenario : public CLASSObject
/// \li 8 end of Cooling,
/// \li 16 fuel Fabrication
-
- int fZAIThreshold; ///<
+ int fZAIThreshold;
+ int fCloverCount; ///<
vector<Storage*> fStorage; ///< Vector of Storages
vector<Pool*> fPool; ///< Vector of Pool
--
GitLab