From 108c8b8c4a14eb443763a6753fc6bf7bacff2ce4 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 19 Nov 2024 20:26:39 +0000 Subject: [PATCH 1/3] Squashed 'examples/' changes from 48e4f323..14217984 14217984 Re-encoded ex22 to utf-8 git-subtree-dir: examples git-subtree-split: 1421798482260cc1490c159749ca5554b3f4e391 --- ex22 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ex22 b/ex22 index 5aa44f78..7309ad8e 100644 --- a/ex22 +++ b/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" From 7b187f0928d5cda58264e4b92818c407b178d7ef Mon Sep 17 00:00:00 2001 From: "Charlton, Scott R." Date: Tue, 19 Nov 2024 14:16:37 -0700 Subject: [PATCH 2/3] [phreeqc3] Updated outputs for 3.8.5 --- examples/ex22.out | 4 ++-- mytest/dl_type_error.out | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/ex22.out b/examples/ex22.out index c955f765..c0201883 100644 --- a/examples/ex22.out +++ b/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" diff --git a/mytest/dl_type_error.out b/mytest/dl_type_error.out index 6c860945..288d52da 100644 --- a/mytest/dl_type_error.out +++ b/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. -------------------------------- - From aab60aa31cb5fa16158440f01ee8cbb468671eac Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 19 Nov 2024 21:26:13 +0000 Subject: [PATCH 3/3] Squashed 'examples/' changes from 14217984..8bf42359 8bf42359 [phreeqc3] Updated outputs for 3.8.5 git-subtree-dir: examples git-subtree-split: 8bf423592e4a25662a9204d8da692f90dd6a4f45 --- ex22.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ex22.out b/ex22.out index c955f765..c0201883 100644 --- a/ex22.out +++ b/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"