Merge branch 'master' into mix_error

Author: dlparkhurst

examples/ex22

@@ -11,7 +11,7 @@ REACTION
 INCREMENTAL_REACTIONS true
 
 USER_GRAPH 1 Example 22,
-  -chart_title "CO2 solubility at high pressures, 25 - 100 �C"
+  -chart_title "CO2 solubility at high pressures, 25 - 100 ºC"
  -plot_csv_file co2.dat
  -axis_titles "Pressure / atm" "CO2 / (mol/kgw)"
  -axis_scale x_axis 0 500
@@ -20,7 +20,7 @@ USER_GRAPH 1 Example 22,
  10 graph_x PR_P("CO2(g)")
  20 graph_y TOT("C(4)")
  -end
-USER_GRAPH 2 Example 22, P-Vm of CO2 gas, 25 - 150 �C
+USER_GRAPH 2 Example 22, P-Vm of CO2 gas, 25 - 150 ºC
  -chart_title "P-Vm of CO2 gas, data from Michels et al., 1935, 1937"
  -plot_csv_file co2_VP.dat
  -axis_titles "molar volume of CO2 gas / (L/mol)" "CO2 pressure / atm"

examples/ex22.out

@@ -33,7 +33,7 @@ Reading input data for simulation 1.
 	 0 31*1
 	INCREMENTAL_REACTIONS true
 	USER_GRAPH 1 Example 22,
-	  -chart_title "CO2 solubility at high pressures, 25 - 100 �C"
+	  -chart_title "CO2 solubility at high pressures, 25 - 100 ºC"
 	 -plot_csv_file co2.dat
 	 -axis_titles "Pressure / atm" "CO2 / (mol/kgw)"
 	 -axis_scale x_axis 0 500
@@ -42,7 +42,7 @@ Reading input data for simulation 1.
 	 10 graph_x PR_P("CO2(g)")
 	 20 graph_y TOT("C(4)")
 	 -end
-	USER_GRAPH 2 Example 22, P-Vm of CO2 gas, 25 - 150 �C
+	USER_GRAPH 2 Example 22, P-Vm of CO2 gas, 25 - 150 ºC
 	 -chart_title "P-Vm of CO2 gas, data from Michels et al., 1935, 1937"
 	 -plot_csv_file co2_VP.dat
 	 -axis_titles "molar volume of CO2 gas / (L/mol)" "CO2 pressure / atm"

mytest/dl_type_error.out

@@ -1,3 +1,4 @@
+WARNING: Database file from DATABASE keyword is used; command line argument ignored.
    Input file: dl_type_error
   Output file: dl_type_error.out
 Database file: ../database/phreeqc.dat
@@ -323,7 +324,3 @@ End of simulation.
 Reading input data for simulation 7.
 ------------------------------------
 
--------------------------------
-End of Run after 2.467 Seconds.
--------------------------------
-