Charlton, Scott R
842feb1938
Converted back to use outputs
2023-01-13 12:37:09 -07:00
Charlton, Scott R
2d878752df
Converted output to env
2023-01-13 12:13:42 -07:00
Charlton, Scott R
49d5fb6b00
Updated source target
...
reordered r-build steps
2023-01-13 11:46:06 -07:00
Charlton, Scott R
7421064ffd
fixed working directory
2023-01-13 11:14:57 -07:00
Charlton, Scott R
c986150d1f
Fixed working directory options
2023-01-13 11:04:12 -07:00
Charlton, Scott R
6e4c6e0f77
Added set working directory
2023-01-13 10:56:52 -07:00
Charlton, Scott R
ae1bd7fa4b
Fixed yml formatting
2023-01-13 10:47:30 -07:00
Charlton, Scott R
2119993bda
Working on R building
2023-01-13 10:41:19 -07:00
Charlton, Scott R
8ecb3cbc85
Added curl install
2023-01-12 20:50:01 -07:00
Charlton, Scott R
25d51d59e1
Updated to the latest actions
2023-01-12 20:08:05 -07:00
Charlton, Scott R
df7a58898e
Adding submission to cdash
2023-01-12 19:48:33 -07:00
Darth Vader
4eef971052
Merge commit '0fe41c1648e1a6801a86b5ae7501763c6d463ae8'
2023-01-09 01:56:16 +00:00
Darth Vader
0fe41c1648
Squashed 'phreeqc3-examples/' changes from 1201d371..b674cfe5
...
b674cfe5 Fixing up ctests for cdash
git-subtree-dir: phreeqc3-examples
git-subtree-split: b674cfe5e8bb3c67617054ecaba65beb78b0c240
2023-01-09 01:56:15 +00:00
Scott Charlton
cfe6dec984
added sudo to apt-get
2022-03-29 11:14:43 -06:00
Scott Charlton
e01a5711ea
added valgrind install
2022-03-29 08:34:53 -06:00
Scott Charlton
141a9abde5
added cd R to Run step
2022-03-28 18:19:24 -06:00
Scott Charlton
31ec7d96c3
added r-valgrind job
2022-03-28 17:28:49 -06:00
Scott Charlton
e31c8d8964
use clang/clang++ for r-build
2022-03-27 13:22:30 -07:00
Scott Charlton
32f3cdec16
changed to windows-latest and Release as BUILD_TYPE
2022-03-27 11:23:38 -07:00
Scott Charlton
f5cb62067c
Fixed RELEASE_DATE for R build
2022-03-26 12:01:35 -07:00
Charlton, Scott R
07351449c0
working on R build automation
2022-03-26 11:50:02 -07:00
Charlton, Scott R
42cd779af8
working on R dist
2022-03-26 09:58:00 -07:00
Charlton, Scott R
6d34a2a8cb
Merge remote-tracking branch 'origin/master'
2022-03-25 10:44:49 -06:00
Darth Vader
a284a40276
Squashed 'src/' changes from 15e9e21c..f676db22
...
f676db22 Merge commit 'e0b04393edfc68bc3bf689e45b4196b165a1ab0a'
e0b04393 Squashed 'phreeqcpp/' changes from ba27ef1..8715a91
git-subtree-dir: src
git-subtree-split: f676db2278b9f1992fd01b5d03f8137d286fa172
2022-03-25 16:37:30 +00:00
Darth Vader
4a4559c5d5
Merge commit 'a284a4027629c14ed1dbc485b9aa448406e0acfd'
2022-03-25 16:37:30 +00:00
Scott Charlton
f0c2b3a839
added directories before check
2022-03-17 11:47:41 -07:00
Scott Charlton
3d66674035
Update cmake.yml
...
changed windows-latest to windows-2019
2022-02-05 11:00:28 -07:00
Darth Vader
937409a9e6
Squashed 'src/' changes from 6beb009a..15e9e21c
...
15e9e21c Merge commit '37a63bcf44e319cea0465322ac36fd73beed6769'
37a63bcf Squashed 'phreeqcpp/' changes from 7cda4a7..ba27ef1
git-subtree-dir: src
git-subtree-split: 15e9e21c6b32a615d6385b10e654a5f3ca999b5d
2022-01-28 22:13:56 +00:00
Darth Vader
f75f0dff85
Merge commit '937409a9e6d4a687ec7691e24c401202359f5c09'
2022-01-28 22:13:56 +00:00
Darth Vader
03171b2d91
Squashed 'src/' changes from a826eecc..6beb009a
...
6beb009a Merge commit '8f2558798f15927fa58343a43c7c14295986ae45'
8f255879 Squashed 'phreeqcpp/' changes from 40f9a93..7cda4a7
git-subtree-dir: src
git-subtree-split: 6beb009a167da83c26f4660ac5ade440bc3dd6fa
2021-11-29 15:20:08 +00:00
Darth Vader
dcfca6c581
Merge commit '03171b2d91a8383671f4c4fa13d15ea44de687cf'
2021-11-29 15:20:08 +00:00
Darth Vader
de976d7afd
Squashed 'phreeqc3-doc/' changes from e52222e9..a321fbd6
...
a321fbd6 fixed ranges in ADVECTION, added test case advect_ranges, fixed RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: a321fbd61bc1901e82e5404f928bef35f679c94f
2021-11-29 15:14:07 +00:00
Darth Vader
af44d99426
Merge commit 'de976d7afddfc08ec750f7c83e0b5bec078a4fb9'
2021-11-29 15:14:07 +00:00
Darth Vader
c995d50084
Squashed 'src/' changes from c41c4e02..a826eecc
...
a826eecc Merge commit '754ea3a9bc11cd1f7d350ff217bdb3dcd3af3d97'
754ea3a9 Squashed 'phreeqcpp/' changes from a376a40..40f9a93
git-subtree-dir: src
git-subtree-split: a826eecc87a37acb91cc80fd757e8322c3f9bf24
2021-11-09 01:59:49 +00:00
Darth Vader
9b8bb8814d
Squashed 'phreeqc3-doc/' changes from 9f3e76c4..e52222e9
...
e52222e9 added change note concerning change in surface related to phase coming into existence
git-subtree-dir: phreeqc3-doc
git-subtree-split: e52222e9fd82aa1f1abfe06e8e43f2d3452cc8ee
2021-11-09 01:59:49 +00:00
Darth Vader
fb796aa897
Merge commit 'c995d50084cf598c12bdd45a585c8f67e999dc6e'
2021-11-09 01:59:49 +00:00
Darth Vader
f87ced1cbe
Merge commit '9b8bb8814dda3b6e0bc24a6dd779a3a0f0d73bda'
2021-11-09 01:59:49 +00:00
Scott R Charlton
25eafc137d
for debugging on jenkins linux
2021-11-02 12:51:03 -06:00
Charlton, Scott R
0110abd368
Reverted to old version for now
2021-11-01 18:51:59 -06:00
Darth Vader
141cad0190
Squashed 'src/' changes from f274a34a..c41c4e02
...
c41c4e02 Merge commit 'e26566584588855e782e2ab4cdd467984a185890'
e2656658 Squashed 'phreeqcpp/' changes from a377818..a376a40
30169e61 Merge commit '3765e0cf266655280d362cdf5de35c25892959b6'
3765e0cf Squashed 'phreeqcpp/' changes from 7e50e98..a377818
git-subtree-dir: src
git-subtree-split: c41c4e0230326ce7c5ac95d4db35396957ea98e4
2021-10-31 19:43:08 +00:00
Darth Vader
92049f1038
Merge commit '141cad01907c7aebf3d86161dc699d1e50e8aff0'
2021-10-31 19:43:08 +00:00
Darth Vader
6691f49e00
Merge commit '24a1004c15a0e9a34da8505cfd3383d1d3909529'
2021-10-31 19:40:52 +00:00
Darth Vader
24a1004c15
Squashed 'phreeqc3-doc/' changes from 1f963b6d..9f3e76c4
...
9f3e76c4 Fixed DIFF_C and SETDIFF_C. Updated RELEASE.txt
git-subtree-dir: phreeqc3-doc
git-subtree-split: 9f3e76c4b9d7a2e9d231b4a201b5cae4c32bec10
2021-10-31 19:40:51 +00:00
Darth Vader
bdd5fc7f00
Merge commit '3ce6dfc59f237dc8788541d444a25693102a7208'
2021-10-31 18:58:46 +00:00
Darth Vader
3ce6dfc59f
Squashed 'src/' changes from 0a194dc6..f274a34a
...
f274a34a Merge commit 'a330bc51e33350cf81008c29742fe570fae074da'
a330bc51 Squashed 'phreeqcpp/' changes from 2243d25..7e50e98
git-subtree-dir: src
git-subtree-split: f274a34a9a1341cf579267a8d2197ada257553a1
2021-10-31 18:58:45 +00:00
Darth Vader
447c105d10
Merge commit '615fa476f56b91463f6c10e63b5266f412f87738'
2021-10-31 18:22:57 +00:00
Darth Vader
615fa476f5
Squashed 'src/' changes from f715edb5..0a194dc6
...
0a194dc6 Merge commit 'b8745514b6031a2cc548d6a3eab54b6a90031bc1'
b8745514 Squashed 'phreeqcpp/' changes from da9d06b..2243d25
f1fa927a git subtree pull now squashes
git-subtree-dir: src
git-subtree-split: 0a194dc6299629e4cb58adb9d960c034526f2fba
2021-10-31 18:22:56 +00:00
Charlton, Scott R
d8046934e9
Update .gitlab-ci.yml
2021-10-31 17:26:02 +00:00
Darth Vader
9207198cdd
Squashed 'examples/fortran/' changes from c5f2dba4..2d5cce26
...
2d5cce26 [iphreeqccom] updated date
ca1fa62b [iphreeqc] updated image location
f39a9de6 added README to examples
f5e8d59e added CMakeLists.txt to examples
c311b23b fixed to run on linux; cleaned examples
ee7d1026 [phreeqc] Testing subtree merges
795138ac [phreeqc] Testing subtree merges 2
46d70ad2 [phreeqc] Testing subtree merges
35cae109 Added .gitlab-ci.yml
73e2f7fc Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6
git-subtree-dir: examples/fortran
git-subtree-split: 2d5cce26a1a9e8bc2e9cca70188d3f37c88667f5
2021-10-30 22:54:23 +00:00
Darth Vader
39086e3af2
Squashed 'database/' changes from 488636ae..20e6e440
...
20e6e440 still produces different residuals
6ea9caf0 Tony H2S. Amm.dat, phreeqc.dat, pitzer.dat, utf8, updated test cases
c1c97a85 before H2S
a7be9fcf Updated Amm.dat, phreeqc.dat, pitzer.dat for H2S(g)
b40b25fd Another SIT database
fce334ff use cmake for valgrind tests
90f9cb53 checking in test cases using latest revisions. degree sign in pitzer.dat
d45a37e0 database UTF-8
3aa7a146 Tony database update, kinetic_rates example
f385cf57 Tony's updates March 10, 2021
88afb660 Tony's changes March 10, 2021.
4396def4 add databases
e4e5449a [wphast] updated date
4c209593 [phreeqc3] updated image location
beaab1d6 more characters
6b8138c2 fixed degree sign
759cac1f fixed some sit.dat characters
3f258562 updated databases
8be6ec5f update to charlton master
2560903d [phreeqci] Testing subtree merges
1d71804f Merge commit 'a400365a5e06a9cd2ac0aa6e2c51fa4797c631f8'
a400365a [phreeqc3] Testing subtree merges
4296b155 Merge commit '0e8069e37275f23d47e04bd6b7873ec56dfdf088'
0e8069e3 Fixed bug with more porosities than cells in TRANSPORT. Added silica sorption to databases. Revised CalPortDiff
fa7cbaf5 Added .gitlab-ci.yml
6a8d5088 Added .gitlab-ci.yml
cfc208b0 updated installer
164b85d3 Fixed some bugs with iso.dat inverse modeling, added test case. Still does not generate [13C](4) and [13C](-4) from SOLUTION
06e25ec8 Correction to core10.dat from Neveu
git-subtree-dir: database
git-subtree-split: 20e6e440f056358f9887ada878a76d8e3d4ecc64
2021-10-30 22:54:23 +00:00
