From 52997d6f60aefecc80b4a51c6bea8e09a090101f Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Fri, 28 Jun 2013 21:24:28 +0000 Subject: [PATCH] [Test] Fix failures in HMW tests when debug_verbose=y Partially addresses Issue 69. --- .../cathermo/HMW_test_1/HMW_test_1.cpp | 19 ------------------- .../cathermo/HMW_test_3/HMW_test_3.cpp | 15 --------------- 2 files changed, 34 deletions(-) diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp index d83dae74b..863672234 100644 --- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp +++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp @@ -5,8 +5,6 @@ using namespace std; using namespace Cantera; -int CHECK_DEBUG_MODE = 0; - void pAtable(HMWSoln* HMW) { size_t nsp = HMW->nSpecies(); @@ -15,13 +13,9 @@ void pAtable(HMWSoln* HMW) double activities[100]; double moll[100]; - if (CHECK_DEBUG_MODE == 1) { - HMW->m_debugCalc = 1; - } HMW->getMolalityActivityCoefficients(acMol); HMW->getMoleFractions(mf); HMW->getActivities(activities); - HMW->m_debugCalc = 0; HMW->getMolalities(moll); string sName; printf(" Name Activity ActCoeffMolal " @@ -45,19 +39,6 @@ int main(int argc, char** argv) HMWSoln* HMW = new HMWSoln(1); -#ifdef DEBUG_MODE - CHECK_DEBUG_MODE = 1; -#endif - if (CHECK_DEBUG_MODE == 1) { - HMW->m_debugCalc = 1; - if (HMW->debugPrinting()) { - FILE* ff = fopen("CheckDebug.txt", "w"); - fprintf(ff,"%1d\n", 1); - fclose(ff); - } - HMW->m_debugCalc = 0; - } - size_t nsp = HMW->nSpecies(); double a1 = HMW->AionicRadius(1); diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp index 8d50c8387..51ecb2f91 100644 --- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp +++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp @@ -5,8 +5,6 @@ using namespace std; using namespace Cantera; -int CHECK_DEBUG_MODE = 0; - void pAtable(HMWSoln* HMW) { size_t nsp = HMW->nSpecies(); @@ -65,19 +63,6 @@ int main(int argc, char** argv) HMW->setState_TPM(Temp, OneAtm, moll); -#ifdef DEBUG_MODE - CHECK_DEBUG_MODE = 1; -#endif - if (CHECK_DEBUG_MODE == 1) { - HMW->m_debugCalc = 1; - if (HMW->debugPrinting()) { - FILE* ff = fopen("CheckDebug.txt", "w"); - fprintf(ff,"%1d\n", 1); - fclose(ff); - } - HMW->m_debugCalc = 1; - } - printf(" Temperature = %.4f K\n", Temp); HMW->printCoeffs(); pAtable(HMW);