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

[Test] Fix compilation errors with VS2015

Browse source
This commit is contained in:
Ray Speth 2015-09-05 11:35:43 -04:00
parent 67172cd478
commit 5ed6d9a2af
22 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
View file

@ -7,7 +7,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
try {

2
test_problems/CpJump/CpJump.cpp
View file

@ -9,7 +9,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
try {

2
test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
View file

@ -25,7 +25,7 @@ void printUsage()
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
suppress_deprecation_warnings();

2
test_problems/VPsilane_test/silane_equil.cpp
View file

@ -11,7 +11,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
try {

2
test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
View file

@ -30,7 +30,7 @@ void pAtable(HMWSoln* HMW)
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
int retn = 0;

2
test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
View file

@ -30,7 +30,7 @@ void pAtable(HMWSoln* HMW)
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif

2
test_problems/cathermo/VPissp/ISSPTester.cpp
View file

@ -24,7 +24,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif

2
test_problems/cathermo/ims/IMSTester.cpp
View file

@ -23,7 +23,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif

2
test_problems/cathermo/issp/ISSPTester.cpp
View file

@ -24,7 +24,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif

2
test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
View file

@ -8,7 +8,7 @@ using namespace Cantera;
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
WaterPropsIAPWSphi* phi = new WaterPropsIAPWSphi();

2
test_problems/cathermo/testIAPWSPres/testPress.cpp
View file

@ -20,7 +20,7 @@ double numdpdt(WaterPropsIAPWS* water, double T, double pres)
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
double dens, u, s, h;

2
test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
View file

@ -9,7 +9,7 @@ using namespace Cantera;
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
double dens, u, s, h, cv, cp, pres;

2
test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
View file

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

2
test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
View file

@ -17,7 +17,7 @@ double tvalue(double val, double atol = 1.0E-9)
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
double pres;

2
test_problems/cxx_ex/examples.cpp
View file

@ -33,7 +33,7 @@ exfun fex[] = {kinetics_example1, kinetics_example3,
// main program
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
int example_num = 0;

2
test_problems/diamondSurf/runDiamond.cpp
View file

@ -26,7 +26,7 @@ void printDbl(double val)
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
if (argc != 2) {

2
test_problems/mixGasTransport/mixGasTransport.cpp
View file

@ -26,7 +26,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
string infile = "diamond.xml";

2
test_problems/multiGasTransport/multiGasTransport.cpp
View file

@ -36,7 +36,7 @@ static double cutoff(double val, double atol=1.0E-15)
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
string infile = "diamond.xml";

2
test_problems/pureFluidTest/testPureWater.cpp
View file

@ -17,7 +17,7 @@ double tvalue(double val, double atol = 1.0E-9)
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
double pres;

2
test_problems/rankine_democxx/rankine.cpp
View file

@ -76,7 +76,7 @@ int openRankine(int np, void* p)
int main()
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
try {

2
test_problems/silane_equil/silane_equil.cpp
View file

@ -9,7 +9,7 @@ using namespace Cantera;
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
try {

2
test_problems/surfSolverTest/surfaceSolver.cpp
View file

@ -150,7 +150,7 @@ void printSurf(ostream& oooo,
int main(int argc, char** argv)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && _MSC_VER < 1900
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
string infile;