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

Viscosity #57

Merged
merged 9 commits into from
May 9, 2024
Merged

Viscosity #57

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e66e21f
Fixed some HTML, still a problem with colors of links.
dlparkhurst May 7, 2024
8d29713
Merge branch 'viscosity' of github.com:dlparkhurst/phreeqc3-1 into vi…
dlparkhurst May 7, 2024
8200396
Merge branch 'master' into viscosity
dlparkhurst May 7, 2024
49ab396
fixed phreeqc3-5.htm, phreeqc3.htm, added kin_r case
dlparkhurst May 8, 2024
577bd47
Merge branch 'master' into viscosity
dlparkhurst May 8, 2024
7ad5a24
delete files in wrong directory
dlparkhurst May 8, 2024
b5a05c2
basicsubs.cpp fix from Tony
dlparkhurst May 8, 2024
9f6151d
Tony's revisions to html files. Updated ex21. Only thing left may be …
dlparkhurst May 8, 2024
d7eb47d
Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste err…
dlparkhurst May 9, 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
Prev Previous commit
Next Next commit
fixed phreeqc3-5.htm, phreeqc3.htm, added kin_r case
  • Loading branch information
@dlparkhurst
dlparkhurst committed May 8, 2024
commit 49ab3964e77e81e947df8880ec56ae440468f991
7,526 changes: 5,357 additions & 2,169 deletions HTMLversion/HTML/phreeqc3-5.htm
View file

Large diffs are not rendered by default.

4,566 changes: 1,011 additions & 3,555 deletions HTMLversion/HTML/phreeqc3-52.htm
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions HTMLversion/HTML/phreeqc3-5_files/colorschememapping.xml
View file
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"/>
8 changes: 8 additions & 0 deletions HTMLversion/HTML/phreeqc3-5_files/filelist.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
<o:MainFile HRef="../phreeqc3-5.htm"/>
<o:File HRef="item0001.xml"/>
<o:File HRef="props002.xml"/>
<o:File HRef="themedata.thmx"/>
<o:File HRef="colorschememapping.xml"/>
<o:File HRef="filelist.xml"/>
</xml>
1 change: 1 addition & 0 deletions HTMLversion/HTML/phreeqc3-5_files/item0001.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="\APASixthEditionOfficeOnline.xsl" StyleName="APA" Version="6"></b:Sources>
2 changes: 2 additions & 0 deletions HTMLversion/HTML/phreeqc3-5_files/props002.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<ds:datastoreItem ds:itemID="{6F6DE159-D386-45C2-8A4E-D478D1C32DF7}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
Binary file added HTMLversion/HTML/phreeqc3-5_files/themedata.thmx
View file
Binary file not shown.
Loading
Oops, something went wrong.