Fixed C++ tests that were failing under Windows

Visual Studio defaults to 3-digit exponents when printing in scientific
notation. The tests now use a MSVC-specific function to change this
behavior when necessary.

test_problems/ChemEquil_gri_matrix/gri_matrix.cpp

@@ -11,6 +11,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   int numSucc = 0;
   int numFail = 0;
   try {

test_problems/ChemEquil_gri_pairs/gri_pairs.cpp

@@ -18,6 +18,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
     IdealGasMix g("gri30.xml", "gri30_mix");
     double pres = 1.0E5;

test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp

@@ -15,6 +15,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
 #ifdef DEBUG_CHEMEQUIL
   ChemEquil_print_lvl = 0;
 #endif

test_problems/ChemEquil_red1/basopt_red1.cpp

@@ -7,6 +7,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
     IdealGasMix g("red1.xml", "gri30_mix");
 

test_problems/CpJump/CpJump.cpp

@@ -18,6 +18,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
     IdealGasMix g("bad_air.xml", "air");
     double pres = 1.0E5;

test_problems/NASA9poly_test/NASA9poly_test.cpp

@@ -38,7 +38,9 @@ void printDbl(double val) {
 }
 
 int main(int argc, char** argv) {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
 
    

test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp

@@ -26,6 +26,9 @@ void printUsage() {
 }
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   //  int solver = 2;
   int numSucc = 0;
   int numFail = 0;

test_problems/VPsilane_test/silane_equil.cpp

@@ -13,6 +13,9 @@ using namespace std;
 using namespace Cantera;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
     PrintCtrl::GlobalCrop = PrintCtrl::GCT_CROP;
     Cantera::IdealSolnGasVPSS gg("silane.xml", "silane");

test_problems/cathermo/HMW_test_1/HMW_test_1.cpp

@@ -48,7 +48,9 @@ void pAtable(HMWSoln *HMW) {
 
 int main(int argc, char **argv)
 {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
    int retn = 0;
 
    try {

test_problems/cathermo/HMW_test_3/HMW_test_3.cpp

@@ -49,6 +49,10 @@ void pAtable(HMWSoln *HMW) {
 
 int main(int argc, char **argv)
 {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
+
    int retn = 0;
    try {
   

test_problems/cathermo/VPissp/ISSPTester.cpp

@@ -44,7 +44,10 @@ static void printUsage()
 using namespace Cantera;
 
 int main(int argc, char** argv) {
-  string infile;  
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
+  string infile;
   // look for command-line options
   if (argc > 1) {
     string tok;

test_problems/cathermo/ims/IMSTester.cpp

@@ -47,6 +47,9 @@ static void printUsage()
 using namespace Cantera;
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   string infile;  
   // look for command-line options
   if (argc > 1) {

test_problems/cathermo/issp/ISSPTester.cpp

@@ -47,6 +47,9 @@ static void printUsage()
 using namespace Cantera;
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   string infile;  
   // look for command-line options
   if (argc > 1) {

test_problems/cathermo/testIAPWS/testIAPWSphi.cpp

@@ -7,7 +7,9 @@
 using namespace std;
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     WaterPropsIAPWSphi *phi = new WaterPropsIAPWSphi();
 
     phi->check1();

test_problems/cathermo/testIAPWSPres/testPress.cpp

@@ -20,7 +20,9 @@ double numdpdt(WaterPropsIAPWS *water, double T, double pres) {
 }
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     double dens, u, s, h;
     WaterPropsIAPWS *water = new WaterPropsIAPWS();
 

test_problems/cathermo/testIAPWSTripP/testTripleP.cpp

@@ -9,7 +9,9 @@ using namespace std;
 using namespace Cantera;
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     double dens, u, s, h, cv, cp, pres;
     WaterPropsIAPWS *water = new WaterPropsIAPWS();
 

test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp

@@ -23,7 +23,9 @@ double tvalue(double val, double atol = 1.0E-9) {
 }
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     double pres;
     try {
       Cantera::VPStandardStateTP *nnn = 0;

test_problems/cathermo/testWaterTP/testWaterSSTP.cpp

@@ -21,7 +21,9 @@ double tvalue(double val, double atol = 1.0E-9) {
 
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   double pres;
   try {
     WaterSSTP *w = new WaterSSTP("waterTPphase.xml","");

test_problems/cxx_ex/examples.cpp

@@ -37,7 +37,9 @@ exfun fex[] = {kinetics_example1, kinetics_example2, kinetics_example3,
 
 // main program
 int main(int argc, char** argv) {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     int example_num = 0;
     cout << endl
          << "-----------------------------------" << endl

test_problems/diamondSurf/runDiamond.cpp

@@ -41,6 +41,9 @@ void printDbl(double val) {
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     int i, k;
     string infile = "diamond.xml";
  

test_problems/fracCoeff/fracCoeff.cpp

@@ -50,6 +50,9 @@ void printDbl(double val) {
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     int i, k;
     string infile = "frac.xml";
     double x[10], kc[10];

test_problems/min_python/minDiamond/runDiamond.cpp

@@ -41,6 +41,9 @@ void printDbl(double val) {
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     int i, k;
     string infile = "diamond.cti";
  

test_problems/min_python/negATest/negATest.cpp

@@ -16,6 +16,9 @@ using namespace std;
 
 #
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {   
     int i;
     string infile = "noxNeg.cti";

test_problems/mixGasTransport/mixGasTransport.cpp

@@ -50,6 +50,9 @@ void printDbl(double val) {
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   int k;
   string infile = "diamond.xml";
  

test_problems/multiGasTransport/multiGasTransport.cpp

@@ -57,6 +57,9 @@ static double cutoff (double val, double atol=1.0E-15) {
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   int k;
   string infile = "diamond.xml";
  

test_problems/negATest/negATest.cpp

@@ -8,6 +8,9 @@ using namespace Cantera;
 using namespace std; 
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {   
     int i;
     std::string infile = "noxNeg.xml";

test_problems/printUtilUnitTest/pUtest.cpp

@@ -284,7 +284,9 @@ void doLogger() {
 }
 
 int main() {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   // How to connect to a file:
   // ofstream fff("redirect.txt");
   // ostream ffs(fff.rdbuf());

test_problems/pureFluidTest/testPureWater.cpp

@@ -18,7 +18,9 @@ double tvalue(double val, double atol = 1.0E-9) {
 
 
 int main () {
-
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     double pres;
     try {
 

test_problems/rankine_democxx/rankine.cpp

@@ -78,6 +78,9 @@ int openRankine(int np, void* p) {
 }
 
 int main() {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     try {
         return openRankine(0, 0);
     }

test_problems/silane_equil/silane_equil.cpp

@@ -18,6 +18,9 @@ using namespace Cantera;
 using namespace Cantera_CXX;
 
 int main(int argc, char **argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   try {
     IdealGasMix g("silane.xml", "silane");
     g.setState_TPX(1500.0, 100.0, "SIH4:0.01, H2:0.99");

test_problems/surfSolverTest/surfaceSolver.cpp

@@ -157,6 +157,9 @@ void printSurf(ostream &oooo,
 }
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
   string infile;
   int ioflag = 1;
   int i, k;

tools/src/ck2cti.cpp

@@ -77,6 +77,9 @@ string getp(int& i, int argc, char** args) {
 
 
 int main(int argc, char** argv) {
+#ifdef _MSC_VER
+    _set_output_format(_TWO_DIGIT_EXPONENT);
+#endif
     string infile="chem.inp", dbfile="", trfile="", logfile;
     string idtag = "gas";
     bool debug = false;