From 394af33811bb6e44bb7e14d14d5a71eb6d960c7f Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 14 Jan 2008 22:49:54 +0000 Subject: [PATCH] Turned on DEBUG_MODE flag rebaselined --- test_problems/cathermo/HMW_test_3/Makefile.in | 11 ++++++-- .../cathermo/HMW_test_3/output_blessed.txt | 26 +++++++++---------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/test_problems/cathermo/HMW_test_3/Makefile.in b/test_problems/cathermo/HMW_test_3/Makefile.in index 09e885a50..90060dffa 100644 --- a/test_problems/cathermo/HMW_test_3/Makefile.in +++ b/test_problems/cathermo/HMW_test_3/Makefile.in @@ -36,11 +36,18 @@ FORT_LIBS = @FLIBS@ # the C++ compiler CXX = @CXX@ +do_DEBUG_MODE = @CANTERA_DEBUG_MODE@ +ifeq ($(do_DEBUG_MODE), 1) +DDD = -DDEBUG_MODE +else +DDD = +endif + # C++ compile flags ifeq ($(src_dir_tree), 1) -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ -DDEBUG_MODE +CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ $(DDD) else -CXX_FLAGS = @CXXFLAGS@ -DDEBUG_MODE +CXX_FLAGS = @CXXFLAGS@ $(DDD) endif # Ending C++ linking libraries diff --git a/test_problems/cathermo/HMW_test_3/output_blessed.txt b/test_problems/cathermo/HMW_test_3/output_blessed.txt index c4e48a56d..f9ebf7018 100644 --- a/test_problems/cathermo/HMW_test_3/output_blessed.txt +++ b/test_problems/cathermo/HMW_test_3/output_blessed.txt @@ -1,7 +1,7 @@ a1 = 3.04284e-10 a2 = 3.04284e-10 Temperature = 423.15 K -Index Name MoleF Molality Charge +Index Name MoleF MolalityCropped Charge 0 H2O(L) 8.1982292e-01 5.5508435e+01 0.0 1 Cl- 9.0088519e-02 6.0996986e+00 -1.0 2 H+ 3.1943127e-11 2.1628000e-09 1.0 @@ -72,15 +72,15 @@ Index Name MoleF Molality Charge Na+ OH- 0.07849 -0.07133 Step 4: Species Species BMX BprimeMX BphiMX -1 0.200614: 0.1775 0.2945 0.0784862 +1 0.200614: 0.1775 0.2945 0 0.0784862 Cl- H+ 0.2006142 -0.0034438 0.1796081 -2 0.129466: 0.10037 0.37071 0.0784862 +2 0.129466: 0.10037 0.37071 0 0.0784862 Cl- Na+ 0.1294658 -0.0043350 0.1030237 Cl- OH- 0.0000000 0.0000000 0.0000000 H+ Na+ 0.0000000 0.0000000 0.0000000 -5 0: 0 0 0 +5 0: 0 0 0 0 H+ OH- 0.0000000 0.0000000 0.0000000 -6 0.106257: 0.0864 0.253 0.0784862 +6 0.106257: 0.0864 0.253 0 0.0784862 Na+ OH- 0.1062570 -0.0029585 0.0882110 Step 5: Species Species CMX @@ -166,15 +166,15 @@ Index Name MoleF Molality Charge Na+ OH- 0.07849 -0.07133 Step 4: Species Species BMX BprimeMX BphiMX -1 0.200614: 0.1775 0.2945 0.0784862 +1 0.200614: 0.1775 0.2945 0 0.0784862 Cl- H+ 0.2006142 -0.0034438 0.1796081 -2 0.129466: 0.10037 0.37071 0.0784862 +2 0.129466: 0.10037 0.37071 0 0.0784862 Cl- Na+ 0.1294658 -0.0043350 0.1030237 Cl- OH- 0.0000000 0.0000000 0.0000000 H+ Na+ 0.0000000 0.0000000 0.0000000 -5 0: 0 0 0 +5 0: 0 0 0 0 H+ OH- 0.0000000 0.0000000 0.0000000 -6 0.106257: 0.0864 0.253 0.0784862 +6 0.106257: 0.0864 0.253 0 0.0784862 Na+ OH- 0.1062570 -0.0029585 0.0882110 Step 5: Species Species CMX @@ -266,15 +266,15 @@ Index Name MoleF Molality Charge Na+ OH- 0.07849 -0.07133 Step 4: Species Species BMX BprimeMX BphiMX -1 0.200614: 0.1775 0.2945 0.0784862 +1 0.200614: 0.1775 0.2945 0 0.0784862 Cl- H+ 0.2006142 -0.0034438 0.1796081 -2 0.129466: 0.10037 0.37071 0.0784862 +2 0.129466: 0.10037 0.37071 0 0.0784862 Cl- Na+ 0.1294658 -0.0043350 0.1030237 Cl- OH- 0.0000000 0.0000000 0.0000000 H+ Na+ 0.0000000 0.0000000 0.0000000 -5 0: 0 0 0 +5 0: 0 0 0 0 H+ OH- 0.0000000 0.0000000 0.0000000 -6 0.106257: 0.0864 0.253 0.0784862 +6 0.106257: 0.0864 0.253 0 0.0784862 Na+ OH- 0.1062570 -0.0029585 0.0882110 Step 5: Species Species CMX