From 5b76ea1d2146bb194878d526eb5deafe0852540e Mon Sep 17 00:00:00 2001 From: David L Parkhurst Date: Mon, 31 Dec 2012 20:27:14 +0000 Subject: [PATCH] at svn 7264. Getting ready for distribution git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7265 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- ex10.out | 2 +- ex11.out | 2 +- ex12a.out | 6 +++--- ex13ac.out | 2 +- ex13b.out | 2 +- ex14.out | 2 +- ex15.out | 6 ++---- ex15a.out | 12 +++++------- ex15b.out | 12 +++++------- ex17.out | 1 - ex17b.out | 3 +-- ex19.out | 2 +- ex19b.out | 6 +++--- ex20a.out | 1 - ex20b.out | 7 +++---- ex21.out | 2 +- ex22.out | 2 +- ex4.out | 2 +- ex6.out | 2 +- ex7.out | 2 +- ex8.out | 2 +- ex9.out | 2 +- 22 files changed, 35 insertions(+), 45 deletions(-) diff --git a/ex10.out b/ex10.out index 4072ce9c..10c50f34 100644 --- a/ex10.out +++ b/ex10.out @@ -8413,6 +8413,6 @@ Misc 1: 4.8032e-03 Misc 2: 8.5786e-01 ------------------------------ -End of Run after 0.54 Seconds. +End of Run after 0.53 Seconds. ------------------------------ diff --git a/ex11.out b/ex11.out index f7baf1e2..855f9166 100644 --- a/ex11.out +++ b/ex11.out @@ -208,6 +208,6 @@ Reading input data for simulation 3. WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 40. WARNING: Dispersivities were read for 1 cells. Last value is used till cell 40. ------------------------------ -End of Run after 5.18 Seconds. +End of Run after 5.27 Seconds. ------------------------------ diff --git a/ex12a.out b/ex12a.out index 6aaa19bc..21f518d4 100644 --- a/ex12a.out +++ b/ex12a.out @@ -165,7 +165,7 @@ WARNING: No dispersivities were read; disp = 0 assumed. 7.5000e+00 1.0547e-05 1.2626e-06 -3.9008e-08 -2.6645e-09 8.5000e+00 3.8231e-06 2.9867e-07 -2.2212e-09 -8.8983e-11 ------------------------------- -End of Run after 1.58 Seconds. ------------------------------- +----------------------------- +End of Run after 1.6 Seconds. +----------------------------- diff --git a/ex13ac.out b/ex13ac.out index 520cb541..586e2431 100644 --- a/ex13ac.out +++ b/ex13ac.out @@ -842,6 +842,6 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20. -end END ------------------------------ -End of Run after 0.75 Seconds. +End of Run after 0.76 Seconds. ------------------------------ diff --git a/ex13b.out b/ex13b.out index 5f13e65b..270bb04d 100644 --- a/ex13b.out +++ b/ex13b.out @@ -451,6 +451,6 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20. -end END ------------------------------ -End of Run after 0.25 Seconds. +End of Run after 0.26 Seconds. ------------------------------ diff --git a/ex14.out b/ex14.out index 206019b7..ae79aa1d 100644 --- a/ex14.out +++ b/ex14.out @@ -1055,6 +1055,6 @@ Reading input data for simulation 6. ------------------------------------ ------------------------------ -End of Run after 0.26 Seconds. +End of Run after 0.25 Seconds. ------------------------------ diff --git a/ex15.out b/ex15.out index e1705d19..cf49e74c 100644 --- a/ex15.out +++ b/ex15.out @@ -1,7 +1,6 @@ -WARNING: Database file from DATABASE keyword is used; command line argument ignored. Input file: ../examples/ex15 Output file: ex15.out -Database file: ex15.dat +Database file: ../examples/ex15.dat ------------------ Reading data base. @@ -14,7 +13,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ex15.dat TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption *********** PLEASE NOTE: This problem requires database file ex15.dat!! @@ -215,6 +213,6 @@ WARNING: USER_PUNCH: Headings count doesn't match number of calls to PUNCH. shifts 110 END ------------------------------- -End of Run after 13.83 Seconds. +End of Run after 13.87 Seconds. ------------------------------- diff --git a/ex15a.out b/ex15a.out index 421ff5ae..a5017299 100644 --- a/ex15a.out +++ b/ex15a.out @@ -1,7 +1,6 @@ -WARNING: Database file from DATABASE keyword is used; command line argument ignored. Input file: ../examples/ex15a Output file: ex15a.out -Database file: ex15.dat +Database file: ../examples/ex15.dat ------------------ Reading data base. @@ -14,7 +13,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ex15.dat TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption *********** PLEASE NOTE: This problem requires database file ex15.dat!! @@ -111,7 +109,7 @@ Reading input data for simulation 1. 30 punch KIN("CoNta_sorption")/3.75e3 40 punch KIN("Biomass") end - USER_GRAPH + USER_GRAPH Example 15A -headings 10_cells: Co+2 CoNTA- HNTA-2 pH -chart_title "Example 15" -axis_titles "Time / hours" "umol / kgw" "pH" @@ -191,7 +189,7 @@ WARNING: USER_PUNCH: Headings count doesn't match number of calls to PUNCH. TRANSPORT Last 55 hours with background infilling solution shifts 110 END --------------------------------- -End of Run after 13.844 Seconds. --------------------------------- +------------------------------- +End of Run after 13.89 Seconds. +------------------------------- diff --git a/ex15b.out b/ex15b.out index 93b9fbd3..007bb67f 100644 --- a/ex15b.out +++ b/ex15b.out @@ -1,7 +1,6 @@ -WARNING: Database file from DATABASE keyword is used; command line argument ignored. Input file: ../examples/ex15b Output file: ex15b.out -Database file: ex15.dat +Database file: ../examples/ex15.dat ------------------ Reading data base. @@ -14,7 +13,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ex15.dat TITLE Example 15.--1D Transport: Kinetic Biodegradation, Cell Growth, and Sorption *********** PLEASE NOTE: This problem requires database file ex15.dat!! @@ -126,7 +124,7 @@ Reading input data for simulation 1. print_cells 10 print_frequency 5 warnings false - USER_GRAPH + USER_GRAPH Example 15B WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 10. WARNING: Dispersivities were read for 1 cells. Last value is used till cell 10. -headings 10_cells: Co+2 CoNTA- Biomass @@ -188,7 +186,7 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20. TRANSPORT Last 55 hours with background infilling solution shifts 110 END --------------------------------- -End of Run after 13.836 Seconds. --------------------------------- +------------------------------- +End of Run after 13.92 Seconds. +------------------------------- diff --git a/ex17.out b/ex17.out index d16443aa..d249bb99 100644 --- a/ex17.out +++ b/ex17.out @@ -19,7 +19,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ../database/pitzer.dat TITLE Example 17.--Inverse modeling of Black Sea water evaporation SOLUTION 1 Black Sea water units mg/L diff --git a/ex17b.out b/ex17b.out index b83a9e06..d0aa6c46 100644 --- a/ex17b.out +++ b/ex17b.out @@ -19,7 +19,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ../database/pitzer.dat SOLUTION 1 Black Sea water units mg/L density 1.014 @@ -3657,6 +3656,6 @@ Reading input data for simulation 2. ------------------------------------ ------------------------------ -End of Run after 0.88 Seconds. +End of Run after 0.78 Seconds. ------------------------------ diff --git a/ex19.out b/ex19.out index fa1d2877..f5aa68b4 100644 --- a/ex19.out +++ b/ex19.out @@ -69,6 +69,6 @@ Reading input data for simulation 1. PRINT reset false ------------------------------ -End of Run after 0.03 Seconds. +End of Run after 0.02 Seconds. ------------------------------ diff --git a/ex19b.out b/ex19b.out index d850fd99..b59f7f85 100644 --- a/ex19b.out +++ b/ex19b.out @@ -22,7 +22,7 @@ Reading input data for simulation 1. TITLE Example 19B.--Cd sorption on X, Hfo and OC in loamy soil PRINT reset false ------------------------------- -End of Run after 0.11 Seconds. ------------------------------- +----------------------------- +End of Run after 0.1 Seconds. +----------------------------- diff --git a/ex20a.out b/ex20a.out index 239ea1e9..49982bd0 100644 --- a/ex20a.out +++ b/ex20a.out @@ -26,7 +26,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ../database/iso.dat TITLE Example 20A.--Calculate carbonate solid solution PRINT censor_species 1e-006 diff --git a/ex20b.out b/ex20b.out index f6d5c8ed..8ea9c695 100644 --- a/ex20b.out +++ b/ex20b.out @@ -26,7 +26,6 @@ Reading data base. Reading input data for simulation 1. ------------------------------------ - DATABASE ../database/iso.dat TITLE Example 20B.--Isotope evolution. PRINT censor_species 1e-006 @@ -53207,7 +53206,7 @@ End of simulation. Reading input data for simulation 114. -------------------------------------- -------------------------------- -End of Run after 13.35 Seconds. -------------------------------- +------------------------------ +End of Run after 13.1 Seconds. +------------------------------ diff --git a/ex21.out b/ex21.out index 5fadb0d3..682babbe 100644 --- a/ex21.out +++ b/ex21.out @@ -969,6 +969,6 @@ WARNING: Trying reduced tolerance 1e-16 ... END END ------------------------------- -End of Run after 20.42 Seconds. +End of Run after 20.56 Seconds. ------------------------------- diff --git a/ex22.out b/ex22.out index 007420e0..5f1c462f 100644 --- a/ex22.out +++ b/ex22.out @@ -10354,6 +10354,6 @@ Reading input data for simulation 5. ------------------------------------ ------------------------------ -End of Run after 0.16 Seconds. +End of Run after 0.15 Seconds. ------------------------------ diff --git a/ex4.out b/ex4.out index 8f60d56c..268ddaab 100644 --- a/ex4.out +++ b/ex4.out @@ -484,6 +484,6 @@ Reading input data for simulation 3. ------------------------------------ ------------------------------ -End of Run after 0.01 Seconds. +End of Run after 0.02 Seconds. ------------------------------ diff --git a/ex6.out b/ex6.out index dcc1ceed..948e7365 100644 --- a/ex6.out +++ b/ex6.out @@ -3809,6 +3809,6 @@ Reading input data for simulation 12. ------------------------------------- ------------------------------ -End of Run after 0.85 Seconds. +End of Run after 0.84 Seconds. ------------------------------ diff --git a/ex7.out b/ex7.out index 7d62a2dc..5bee9a7b 100644 --- a/ex7.out +++ b/ex7.out @@ -3083,6 +3083,6 @@ Reading input data for simulation 4. ------------------------------------ ------------------------------ -End of Run after 0.04 Seconds. +End of Run after 0.05 Seconds. ------------------------------ diff --git a/ex8.out b/ex8.out index 6ff766ec..d295a993 100644 --- a/ex8.out +++ b/ex8.out @@ -3824,6 +3824,6 @@ Reading input data for simulation 34. ------------------------------------- ------------------------------ -End of Run after 0.07 Seconds. +End of Run after 0.06 Seconds. ------------------------------ diff --git a/ex9.out b/ex9.out index fb89b6ed..e20a0ca6 100644 --- a/ex9.out +++ b/ex9.out @@ -1331,6 +1331,6 @@ Reading input data for simulation 3. ------------------------------------ ------------------------------ -End of Run after 0.05 Seconds. +End of Run after 0.06 Seconds. ------------------------------