Squashed 'phreeqc3-examples/' changes from e977363d..1201d371

1201d371 added all examples
35636414 use cmake for valgrind tests
49d67912 [webmod] updated date
d2ea5947 [phreeqc3] updated image location
f464c3c4 saved as utf-8
a9303d18 [phreeqci] Testing subtree merges
6d4acba1 [phreeqc3] Testing subtree merges
a09a24b2 Added .gitlab-ci.yml
e6e3f30a checking in ex20_debug (added precision) and results
4128d5d4 another try for ex20_debug

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1201d371a220072c5f33f01210f7be7c75ed1866

.gitlab-ci.yml

@@ -0,0 +1,46 @@
+#
+# https://code.chs.usgs.gov/coupled/subtrees/phreeqc3-examples
+# SRC 2020-12-02T18:39:55-07:00
+#
+image: ${CI_REGISTRY}/coupled/containers/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-examples
+  ## 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
+  ## 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 phreeqc3
+    - 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

Makefile.old

@@ -12,7 +12,7 @@ VALGRIND=
 ifeq ($(CFG), Linux)
 	PHREEQC=../src/Class_release_64/phreeqc
 else
-	PHREEQC=../x64/Release/phreeqc.exe
+	PHREEQC=../_build_x64/Release/phreeqc.exe
 endif
 
 all: ex1.out ex2.out ex2b.out ex3.out ex4.out ex5.out ex6.out ex7.out ex8.out ex9.out \

ex21

@@ -79,7 +79,7 @@ USER_PUNCH
 # 140  CEC = 0.12 * rho_b_eps   # CEC / (eq/L porewater)
  # adapted for the harmonic mean calc's in version 3.4.2
 140  CEC = 0.09 * rho_b_eps   # CEC / (eq/L porewater)
-150  A_por = 37e3 * rho_b_eps # pore surface area / (m²/L porewater)
+150  A_por = 37e3 * rho_b_eps # pore surface area / (m²/L porewater)
 
 160  DIM tracer$(4), exp_time(4), scale_y1$(4), scale_y2$(4), profile_y1$(4), profile_y2$(4)
 170  DATA 'Hto', 'Cl_tr', 'Na_tr', 'Cs'
@@ -101,7 +101,7 @@ USER_PUNCH
 310  READ profile_y2$(1), profile_y2$(2), profile_y2$(3), profile_y2$(4)
 
      # Define model parameters...
-350  Dw = 2.5e-9              # default tracer diffusion coefficient / (m²/s)
+350  Dw = 2.5e-9              # default tracer diffusion coefficient / (m²/s)
 360  nfilt1 = 1               # number of cells in filter 1
 370  nfilt2 = 1               # number of cells in filter 2
 380  nclay = 11               # number of clay cells
@@ -197,7 +197,7 @@ USER_PUNCH
 
      # Define mixing factors for the diffusive flux between cells 1 and 2:
      #    J_12 = -2 * Dw / (x_1 / g_1 + x_2 / g_2) * (c_2 - c_1)
-     # Multiply with dt * A / (V = 1e-3 m³).  (Actual volumes are given with SOLUTION; -water)
+     # Multiply with dt * A / (V = 1e-3 m³).  (Actual volumes are given with SOLUTION; -water)
      # Use harmonic mean: g_1 = por_1 / G_1, g_2 = por_2 / G_2, x_1 = Delta(x_1), etc.
 1400 IF nfilt1 > 0 THEN gf1 = por_filter1 / G_filter1
 1410 IF nfilt2 > 0 THEN gf2 = por_filter2 / G_filter2