research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added in a static global variable that controls cropping.

Browse source
This commit is contained in:
Harry Moffat 2009-03-14 00:27:10 +00:00
parent 8389db7a22
commit 89f8dc531e
2 changed files with 76 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Cantera/src/base/PrintCtrl.cpp
View file

@ -26,12 +26,19 @@ using namespace std;
namespace Cantera {
PrintCtrl::PrintCtrl(std::ostream &coutProxy, int Ndec) :
// Storage for the global crop flag
PrintCtrl::CROP_TYPE_GLOBAL PrintCtrl::GlobalCrop = GCT_NOPREF;
PrintCtrl::PrintCtrl(std::ostream &coutProxy, int Ndec,
CROP_TYPE ctlocal) :
m_cout(coutProxy),
m_Ndec(Ndec),
m_precision(12),
m_wMin(9),
m_wMax(19)
m_wMax(19),
m_cropCntrl(ctlocal)
{
}
@ -139,6 +146,9 @@ namespace Cantera {
* This routine will return 0.0
*/
double PrintCtrl::cropAbs10(const double d, int Ndec) const {
if (!doCrop()) {
return d;
}
if (Ndec < -301 || Ndec > 301) {
return d;
}
@ -171,6 +181,9 @@ namespace Cantera {
* This routine will return 1.03E-15
*/
double PrintCtrl::cropSigDigits(const double d, int nSig) const {
if (!doCrop()) {
return d;
}
if (nSig <=0) nSig = 1;
if (nSig >=9) nSig = 9;
double sgn = 1.0;
@ -244,5 +257,21 @@ namespace Cantera {
return nold;
}
bool PrintCtrl::doCrop() const {
bool retn = ((m_cropCntrl == CT_ON) || (m_cropCntrl == CT_ON_GLOBALOBEY));
if (m_cropCntrl == CT_ON_GLOBALOBEY) {
if (GlobalCrop == GCT_NOCROP) {
retn = false;
}
} else if (m_cropCntrl == CT_OFF_GLOBALOBEY) {
if (GlobalCrop == GCT_CROP) {
retn = true;
}
}
return retn;
}
void PrintCtrl:: setCropCntrl(CROP_TYPE ctlocal) {
m_cropCntrl = ctlocal;
}
}

46
Cantera/src/base/PrintCtrl.h
View file

@ -54,6 +54,34 @@ namespace Cantera {
class PrintCtrl {
public:
//! enum for cropping control
enum CROP_TYPE {
//! Turn off cropping always
CT_OFF=0,
//! Turn off cropping, unless the global toggle is turned on
CT_OFF_GLOBALOBEY,
//! Turn on cropping unless the global toggle is turned off
CT_ON_GLOBALOBEY,
//! Turn on cropping always
CT_ON
};
//! enum for global cropping control
enum CROP_TYPE_GLOBAL {
//! no preference for global cropping
GCT_NOPREF = 0,
//! global toggle for turning on cropping
GCT_CROP,
//! global toggle for turning off cropping
GCT_NOCROP
};
//! static enum for turning on and off cropping
/*!
* The default is to not have a preference for cropping
*/
static CROP_TYPE_GLOBAL GlobalCrop;
//! Constructor
/*!
* This also serves to initialize the ticks within the object
@ -62,8 +90,10 @@ namespace Cantera {
* to use for all IO from ths object.
* @param Ndec value of Ndec. Defaults to -1000, i.e.,
* no decade cropping
* @param ctlocal The default is to turn on cropping all the time.
*/
PrintCtrl(std::ostream &coutProxy = std::cout, int Ndec = -1000);
PrintCtrl(std::ostream &coutProxy = std::cout, int Ndec = -1000,
CROP_TYPE ctlocal = CT_ON);
//! Print a double using scientific notation
/*!
@ -172,9 +202,21 @@ namespace Cantera {
* @return returns the old default
*/
int setWmax(int wMax);
//! Set the cropping control flag
/*!
* @param ctlocal Local enum value for the cropping type
*/
void setCropCntrl(CROP_TYPE ctlocal);
private:
//! private function to figure out cropping logic
/*!
* @return Returns the decision as to whether to crop or not
*/
bool doCrop() const;
//! This is the ostream to send all output from the object
/*!
@ -209,6 +251,8 @@ namespace Cantera {
*/
int m_wMax;
//! Local Cropping Control
CROP_TYPE m_cropCntrl;
};
}