Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge viscosity branch of dlparkhurst/phreeqc3-1 into master #56

Merged
merged 13 commits into from
May 7, 2024
Merged

Merge viscosity branch of dlparkhurst/phreeqc3-1 into master #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f964fa
added Kinec.v2.dat and updated RELEASE.TXT
dlparkhurst Apr 19, 2024
6ffbf41
added put$ and get$ Basic functions. Added test cases get_put_ to tes…
dlparkhurst Apr 22, 2024
26ceff1
Tony's latest databases
dlparkhurst Apr 22, 2024
d056b21
Added Basic function RATE_PK and RATE_SVERDRUP
dlparkhurst Apr 23, 2024
4e570a8
Implemented rate parameters PK, SVD, Hermanska
dlparkhurst Apr 24, 2024
37988ba
Finished up mean_gammas keyword and test case. Tony has some new chan…
dlparkhurst Apr 25, 2024
a65ac12
Tony added table numbers, kinetic_rates_plus has complete tables.
dlparkhurst Apr 26, 2024
cf48c0a
Untabified RATE_PARAMETERS_*
dlparkhurst Apr 26, 2024
a617512
Added a little error checking to tokrate_pk
dlparkhurst Apr 26, 2024
2586568
Word from PDF for documentation
dlparkhurst Apr 27, 2024
1748a90
Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, …
dlparkhurst May 6, 2024
89cffe3
removed CALCULATE_VALUES description
dlparkhurst May 7, 2024
ec4f6c3
fixed case of Kinec.v2.dat
scharlton2 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,735 changes: 2,735 additions & 0 deletions HTMLversion/HTML/mean_gammas.htm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions HTMLversion/HTML/mean_gammas_files/colorschememapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
6 changes: 6 additions & 0 deletions HTMLversion/HTML/mean_gammas_files/filelist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
<o:MainFile HRef="../mean_gammas.htm"/>
<o:File HRef="themedata.thmx"/>
<o:File HRef="colorschememapping.xml"/>
<o:File HRef="filelist.xml"/>
</xml>
Binary file added HTMLversion/HTML/mean_gammas_files/themedata.thmx
View file
Open in desktop
Binary file not shown.
2,864 changes: 2,580 additions & 284 deletions HTMLversion/HTML/phreeqc3-26.htm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions HTMLversion/HTML/phreeqc3-26_files/colorschememapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
6 changes: 6 additions & 0 deletions HTMLversion/HTML/phreeqc3-26_files/filelist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
<o:MainFile HRef="../phreeqc3-26.htm"/>
<o:File HRef="themedata.thmx"/>
<o:File HRef="colorschememapping.xml"/>
<o:File HRef="filelist.xml"/>
</xml>
Binary file added HTMLversion/HTML/phreeqc3-26_files/themedata.thmx
View file
Open in desktop
Binary file not shown.
2,534 changes: 2,440 additions & 94 deletions HTMLversion/HTML/phreeqc3-27.htm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions HTMLversion/HTML/phreeqc3-27_files/colorschememapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
6 changes: 6 additions & 0 deletions HTMLversion/HTML/phreeqc3-27_files/filelist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
<o:MainFile HRef="../phreeqc3-27.htm"/>
<o:File HRef="themedata.thmx"/>
<o:File HRef="colorschememapping.xml"/>
<o:File HRef="filelist.xml"/>
</xml>
Binary file added HTMLversion/HTML/phreeqc3-27_files/themedata.thmx
View file
Open in desktop
Binary file not shown.
Loading