From d10040e8963ba76a00bb5bf8d6c284a54c162abc Mon Sep 17 00:00:00 2001
From: Scott Charlton <charlton@usgs.gov>
Date: Sat, 18 Jan 2020 23:27:37 -0700
Subject: [PATCH 1/2] Added .gitlab-ci.yml

---
 .gitlab-ci.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..77e8364c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,51 @@
+#
+# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-doc
+#
+image: buildpack-deps:bionic-scm
+
+stages:
+  - trigger
+
+before_script:
+  - eval $(ssh-agent -s)
+  - echo "${SSH_PRIVATE_KEY_ENC}" | base64 --decode | tr -d '\r' | ssh-add -
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  - ssh-keyscan ${CI_SERVER_HOST} >> ~/.ssh/known_hosts
+  - chmod 644 ~/.ssh/known_hosts
+  - git config --global user.email "darth@empire.com"
+  - git config --global user.name "Darth Vader"
+ 
+trigger-downstream:
+  stage: trigger
+  ##
+  ## Only run if on the master branch and the variable GROUP is set
+  ##
+  ## change this to
+  ## only:
+  ##  - master@$GROUP/subtrees/phreeqc3-doc
+  ## and set GROUP to coupled before merge
+  only:
+    refs:
+      - master
+    variables:
+      - $GROUP
+
+  ## Downstream Projects
+  ## triggers and ids are stored at the group level
+  ## iphreeqc     https://code.chs.usgs.gov/coupled/iphreeqc
+  ## iphreeqccom  https://code.chs.usgs.gov/coupled/iphreeqccom
+  ## phast3-doc   https://code.chs.usgs.gov/coupled/subtrees/phast3-doc
+  ## phreeqc3     https://code.chs.usgs.gov/coupled/phreeqc3
+  script:
+    - echo triggering iphreeqc
+    - curl -X POST -F token=${IPHREEQC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${IPHREEQC_ID}/trigger/pipeline
+    - echo triggering iphreeqccom
+    - curl -X POST -F token=${IPHREEQCCOM_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${IPHREEQCCOM_ID}/trigger/pipeline
+    - echo triggering phast3-doc PHAST3_DOC_TRIGGER PHAST3_DOC_ID
+    - curl -X POST -F token=${PHAST3_DOC_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHAST3_DOC_ID}/trigger/pipeline
+    - echo triggering phreeqc3  PHREEQC3_TRIGGER PHREEQC3_ID
+    - curl -X POST -F token=${PHREEQC3_TRIGGER} -F ref=master https://code.chs.usgs.gov/api/v4/projects/${PHREEQC3_ID}/trigger/pipeline
+
+  ## Upstream Projects
+  ## none

From 006fd2459d694c18c772996098d662960a35a628 Mon Sep 17 00:00:00 2001
From: David Parkhurst <dlpark@usgs.gov>
Date: Sun, 26 Jan 2020 18:55:23 -0700
Subject: [PATCH 2/2] Fixed bug with more porosities than cells in TRANSPORT.
 Added silica sorption to databases. Revised CalPortDiff

---
 RELEASE.TXT | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/RELEASE.TXT b/RELEASE.TXT
index 30cbaeda..74665a19 100644
--- a/RELEASE.TXT
+++ b/RELEASE.TXT
@@ -1,4 +1,18 @@
 Version @PHREEQC_VER@: @PHREEQC_DATE@
+ 	----------------
+	January 23, 2020
+	----------------
+
+    Updated documentation in phreeqc.chm and online 
+https://water.usgs.gov/water-resources/software/PHREEQC/documentation/phreeqc3-html/phreeqc3.htm
+
+	PHREEQC: Added silicate sorption to Hfo_w from Swedlund, P.J. and Webster, J.G., 1999, 
+	Water Research 33, 3413-3422 for Amm.dat, phreeqc.dat, pitzer.dat, and wateq4f.dat.
+	
+	PHREEQC: Fixed memory error in TRANSPORT if number of porosities exceeded the number of cells.
+
+
+Version 3.6.1: January 7, 2020
  	---------------
 	January 2, 2020
 	---------------