Darth Vader
6fb40a2b32
Merge commit '8e1a4d08360d4dbfa1505460fa5323ca24085528'
2024-04-05 17:14:37 +00:00
Darth Vader
8e1a4d0836
Squashed 'database/' changes from 976555e2..22eb9506
...
22eb9506 normalized text files
git-subtree-dir: database
git-subtree-split: 22eb9506866dbce35ae69811760e51e5fc785b5c
2024-04-05 17:14:37 +00:00
Darth Vader
894d25fb5a
Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
2024-04-05 17:14:35 +00:00
Darth Vader
63ca4c7ef4
Squashed 'src/' changes from 6fd34ae3..2dcf4062
...
2dcf4062 normalized text files
git-subtree-dir: src
git-subtree-split: 2dcf40623ff462e2b379cd5f8ed8299928d0a6fd
2024-04-05 17:14:35 +00:00
Scott R Charlton
a0f62fd540
increased the number of lines
2024-03-14 17:01:29 -06:00
Charlton, Scott R
999ceb7741
Updated old unit tests
2024-03-14 13:43:06 -06:00
Darth Vader
76aea93737
Squashed 'database/' changes from 9665bd4a..976555e2
...
976555e2 Added PHREEQC_ThermoddemV1.10_15Dec2020.dat
git-subtree-dir: database
git-subtree-split: 976555e201ea1ba8a0f37a78edfeec0e1550dd98
2024-03-13 18:03:29 +00:00
Darth Vader
9921b0b0a4
Merge commit '76aea9373733cbcbc1d4bb44f41a567c4d2fcf27'
2024-03-13 18:03:29 +00:00
Darth Vader
d59be381ee
Squashed 'database/' changes from e0447f7a..9665bd4a
...
9665bd4a Updated for ubuntu 22.04
git-subtree-dir: database
git-subtree-split: 9665bd4a81b47793f54efa908511c8caaa890d53
2024-03-05 18:15:01 +00:00
Darth Vader
ba475ee488
Merge commit 'd59be381ee545f7c2295428fd731d80fb2727b58'
2024-03-05 18:15:01 +00:00
Darth Vader
07f1d0d468
Squashed 'src/' changes from 64e51c1d..6fd34ae3
...
6fd34ae3 Merge commit '0ebad0eedcbb952d1411042592b4081823abdbf5'
0ebad0ee Squashed 'phreeqcpp/' changes from 9925ceb..87919a0
git-subtree-dir: src
git-subtree-split: 6fd34ae38050a84a6fccf32298615edbfa3f7830
2024-03-05 15:44:19 +00:00
Darth Vader
a200f387a9
Merge commit '07f1d0d4680fe19cf1d77ea86b6485b319607f96'
2024-03-05 15:44:19 +00:00
Darth Vader
b96cfe8114
Squashed 'src/' changes from ba2ac191..64e51c1d
...
64e51c1d Try this to fix warning on Darwin
79518dee fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
git-subtree-dir: src
git-subtree-split: 64e51c1d13711fd636fc9df7532d21d3584b52aa
2024-03-05 15:41:19 +00:00
Darth Vader
7d4df5893d
Merge commit 'b96cfe81141ed6734872794468ac9bb321ba9d8b'
2024-03-05 15:41:19 +00:00
Charlton, Scott R
1a8e4166dc
Merge pull request #42 from usgs-coupled/37-older-c++-compilers-dont-support-nullptr
...
37 older c++ compilers dont support nullptr
2024-03-05 08:37:06 -07:00
Scott R Charlton
5ab544f7ca
Try this to fix warning on Darwin
2024-03-04 19:11:28 -07:00
Scott R Charlton
e5803f9449
fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
2024-03-04 18:42:52 -07:00
Charlton, Scott R
fe188a10e0
Merge pull request #40 from scharlton2/38-nodejs-16-actions-are-deprecated
...
38 nodejs 16 actions are deprecated
2024-02-29 12:33:03 -07:00
Charlton, Scott R
7a2e137765
Merge branch 'usgs-coupled:master' into 38-nodejs-16-actions-are-deprecated
2024-02-29 12:02:25 -07:00
Charlton, Scott R
e2b1bddee4
Updated actions/download-artifacts version
2024-02-29 12:01:21 -07:00
Charlton, Scott R
12483c3d0c
Merge pull request #39 from scharlton2/38-nodejs-16-actions-are-deprecated
...
Updated Node.js actions
2024-02-29 11:55:56 -07:00
Charlton, Scott R
8d995bc229
And another
2024-02-29 11:50:50 -07:00
Charlton, Scott R
d44b47a019
Another test
2024-02-29 11:47:20 -07:00
Charlton, Scott R
bc6bb15279
Pull Request not running on actions
2024-02-29 11:44:59 -07:00
Charlton, Scott R
956eff22f9
Updated Node.js actions
2024-02-29 11:20:27 -07:00
Charlton, Scott R
342a7461f5
Add apt-get update to linux build
2023-12-11 10:55:08 -07:00
Charlton, Scott R
9af26d4209
Merge pull request #35 from scharlton2/cran-update-v3.7.5
...
CRAN update to v3.7.5
2023-12-07 09:25:58 -07:00
Charlton, Scott R
d77b07649c
Updated tm6-A43.pdf links
2023-12-06 16:36:07 -07:00
Charlton, Scott R
35521760a5
Missed adding R.cpp
2023-12-06 12:13:58 -07:00
Charlton, Scott R
220db26eb7
Fixes v3.7.5 for CRAN
2023-12-06 11:58:57 -07:00
Darth Vader
0d4210cb6c
Merge commit 'cb06063eaebcdc140a770d4f70fcda2b74345a04'
2023-11-20 01:06:37 +00:00
Darth Vader
cb06063eae
Squashed 'phreeqc3-doc/' changes from f1ef4343..f289b94c
...
f289b94c Updated to force subtree merges
git-subtree-dir: phreeqc3-doc
git-subtree-split: f289b94cda5705b762909891b8f330e7f243595b
2023-11-20 01:06:36 +00:00
Darth Vader
4a8e5582e7
Squashed 'database/' changes from 6b0972bd..e0447f7a
...
e0447f7a Minimum data base.
git-subtree-dir: database
git-subtree-split: e0447f7ad56fc91f0c37b79f3e895fd700f048a6
2023-11-20 00:17:18 +00:00
Darth Vader
ad2e4c190a
Merge commit '4a8e5582e71650340a3a0d4368b02a1e09af3ac3'
2023-11-20 00:17:18 +00:00
Darth Vader
7c3090dc15
Squashed 'phreeqc3-doc/' changes from 12e58e3e..f1ef4343
...
f1ef4343 [skip ci] Fixed typo Added path-ignore to github actions
b81c0fa8 update RELEASE.TXT
fd52458b release notes update
git-subtree-dir: phreeqc3-doc
git-subtree-split: f1ef4343674725bf10c69247bec90f3e5549a093
2023-11-20 00:17:11 +00:00
Darth Vader
3c3b930f79
Merge commit '7c3090dc15d95be8759e7c83d885d63590ad7895'
2023-11-20 00:17:11 +00:00
Darth Vader
7f291d1c56
Squashed 'src/' changes from a8a469b2..ba2ac191
...
ba2ac191 Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'
488c119a Squashed 'phreeqcpp/' changes from f975e17..9925ceb
git-subtree-dir: src
git-subtree-split: ba2ac191650c3db3e396fd006e26c18587efdf09
2023-11-18 03:55:04 +00:00
Darth Vader
d60f911361
Merge commit '7f291d1c56070131ef8e5b665c58dfb953ec5ebd'
2023-11-18 03:55:04 +00:00
Darth Vader
7027935759
Squashed 'src/' changes from 6ce9ad66..a8a469b2
...
a8a469b2 Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d'
a5b8a03f Squashed 'phreeqcpp/' changes from ff1cc7a..f975e17
git-subtree-dir: src
git-subtree-split: a8a469b26ffa800f78faccbe9e072640563d8e3f
2023-11-18 01:36:06 +00:00
Darth Vader
e5912ff5ee
Merge commit '70279357596338c2e09bbe32fefe5417e82193df'
2023-11-18 01:36:06 +00:00
Darth Vader
d554fc3acf
Squashed 'src/' changes from c7c1a23d..6ce9ad66
...
6ce9ad66 Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29'
589ec40c Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a
git-subtree-dir: src
git-subtree-split: 6ce9ad665a2c2df324fb9e1f7317da862fc4f4dd
2023-11-18 01:32:52 +00:00
Darth Vader
2ae904be96
Merge commit 'd554fc3acfdfbe18c34c6c527fc685643129db2b'
2023-11-18 01:32:52 +00:00
Charlton, Scott R
a3f4407c10
Added workflow_dispatch
2023-11-16 08:52:13 -08:00
Darth Vader
d1b5d92efc
Squashed 'src/' changes from 1df4f189..c7c1a23d
...
c7c1a23d Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e'
deb49773 Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9
git-subtree-dir: src
git-subtree-split: c7c1a23d71636e117713e6a0e74a7b7ac8cff803
2023-11-16 05:12:33 +00:00
Darth Vader
976c9f2bc4
Merge commit 'd1b5d92efc04bd216d5354cb2df537d1ded008b0'
2023-11-16 05:12:33 +00:00
Darth Vader
37276c050f
Squashed 'src/' changes from 81f180a0..1df4f189
...
1df4f189 Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2'
ed1fbe94 Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1
git-subtree-dir: src
git-subtree-split: 1df4f189113f240fd735471f78f038415071d500
2023-11-16 05:09:42 +00:00
Darth Vader
f3e2cf93c6
Merge commit '37276c050f8194055e00a875c185c4f0ffe38abf'
2023-11-16 05:09:42 +00:00
Darth Vader
e47e051db0
Merge commit '1b2eb6ca0dfb1229d50bcb58c12ac6d6f63bbe4c'
2023-11-16 05:04:40 +00:00
Darth Vader
1b2eb6ca0d
Squashed 'src/' changes from 6e248c34..81f180a0
...
81f180a0 Fixed bugs in inverse
6d575967 strcpy_safe and strcat_safe
6d98c4e1 trying different header files
72796f15 added <cstring>
e8481607 warnings, strcat, strcpy
988bdee0 Try using goto(s)
9b10ce3f Try updated logical expression
812061be Turn off optimizing on k_temp
git-subtree-dir: src
git-subtree-split: 81f180a069285bcb4d180c860664b4b2a193854d
2023-11-16 05:04:39 +00:00
Darth Vader
4aa362825b
Merge commit '10bcb271d74cf65f6427a7293f1b32c043bc7180'
2023-08-27 01:17:34 +00:00
