Charlton, Scott R
5f00edf1ab
Use phreeqc.dat from 90a6449 for TestMultiPunchCSelectedOutput tests
2024-04-19 16:37:58 -06:00
Darth Vader
5898c60f38
Merge commit 'b1888bb5d68d0ae9736556acd5702d44448eb492'
2024-04-19 19:50:20 +00:00
Darth Vader
b1888bb5d6
Squashed 'src/' changes from 478318af..8acfbb38
...
8acfbb38 Merge branch 'master' into module
666e4b81 Issue 160 in phreeqc. llnl minimum temperature problem. There are several places where a SOLUTION is constructed to get lists or test the database. By default the SOLUTION is 25C, so if llnl has a minimum temperature greater (or maximum temperature less) than 25, an error is encountered. The fix is to change the temperature of the SOLUTIONs to the minimum temperature of the llnl grid if llnl is being used.
git-subtree-dir: src
git-subtree-split: 8acfbb384a34dead1b805f5ee33d7dcd6c0b3a13
2024-04-19 19:50:19 +00:00
Darth Vader
abbac3bb03
Merge commit '799a4e7ee471ab80ac21f4dceb7233324576c6da'
2024-04-18 21:18:02 +00:00
Darth Vader
799a4e7ee4
Squashed 'src/' changes from e8c03d16..478318af
...
478318af Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8'
f100f492 Squashed 'phreeqcpp/' changes from 89d028d..0243c90
git-subtree-dir: src
git-subtree-split: 478318affeece3b1026a8c6a9d44264d61766bfa
2024-04-18 21:18:01 +00:00
Darth Vader
8bd2c62315
Merge commit '9d0b5a7440499bf4adb70d39e2a743cc07f2380a'
2024-04-18 20:08:49 +00:00
Darth Vader
9d0b5a7440
Squashed 'phreeqc3-examples/' changes from fbe17c9e..a9d1de8f
...
a9d1de8f Updated output files (from windows)
47ace2e0 Changed examples/ex21 encoding to UTF-8
git-subtree-dir: phreeqc3-examples
git-subtree-split: a9d1de8fa2842e839fabadc1f4a49fe3afb23ab1
2024-04-18 20:08:49 +00:00
Darth Vader
e64f73da33
Merge commit 'e53806d1564015bc179c2b479c305c5ac8a279b3'
2024-04-18 18:17:14 +00:00
Darth Vader
e53806d156
Squashed 'phreeqc3-examples/' changes from 5fe290be..fbe17c9e
...
fbe17c9e Tony's update to example 21
git-subtree-dir: phreeqc3-examples
git-subtree-split: fbe17c9e10e5d468a074faab593e07b63dda68fe
2024-04-18 18:17:14 +00:00
Darth Vader
4080dd2f0c
Merge commit '519b2e6b4c364a454a491ad8791473097fbd370c'
2024-04-18 18:17:13 +00:00
Darth Vader
519b2e6b4c
Squashed 'database/' changes from bae20ea7..49d82d37
...
49d82d37 fix for new Valgrind problem. Added a newer CEMDATA database for the database collection.
ad2440a3 Tony changes 20240414, with correction to CH4 Vm. Changes to src. seaw_SC expanded.
b3469711 Merge branch 'master' into viscosity
87eeeec8 Merge branch 'master' into viscosity
git-subtree-dir: database
git-subtree-split: 49d82d37607fa4814aa4f13df0960ffd36e8fdcf
2024-04-18 18:17:13 +00:00
Darth Vader
1d8783186c
Squashed 'src/' changes from b4a42445..e8c03d16
...
e8c03d16 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d'
c378c74d Squashed 'phreeqcpp/' changes from 7284fed..89d028d
git-subtree-dir: src
git-subtree-split: e8c03d169346861db62629edb0ca43e1fd688be9
2024-04-18 18:17:11 +00:00
Darth Vader
c76339d766
Merge commit '1d8783186c3d231e5ca909a0427cb33b2c29d558'
2024-04-18 18:17:11 +00:00
Darth Vader
0cec5dbf66
Merge commit '6bfe0dbbabf4a194c69c3f32bf7314896e3efcc9'
2024-04-18 18:17:09 +00:00
Darth Vader
6bfe0dbbab
Squashed 'phreeqc3-doc/' changes from e30aa466..36acf3ff
...
36acf3ff updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: 36acf3ff50e03e7985f71c24eb196e8f43e875c7
2024-04-18 18:17:09 +00:00
Darth Vader
4a0af1be39
Squashed 'database/' changes from 22eb9506..bae20ea7
...
bae20ea7 Merge pull request #45 from dlparkhurst/viscosity
d18452f3 All test cases run. Fixed CALCULATED_VALUES and RATES in Amm.dat and phreeqc.dat
5c6d1c5a Tony's changes Mar 15, 2024
39130824 Tony's changes Mar 15, 2024
bc1f8f86 Tony's changes Mar 15, 2024
3318883e Tony's Mar 15, changes.
77038cb6 modified NH3 from Tony's Amm.dat
e510f752 Tony's changes 2/12/2024
git-subtree-dir: database
git-subtree-split: bae20ea7e849a914e6abea15c71cdad69db68db7
2024-04-17 00:17:32 +00:00
Darth Vader
492db1c5b2
Merge commit '4a0af1be39596d05b048931f9b3f25b1ae93e4b1'
2024-04-17 00:17:32 +00:00
Darth Vader
ccdbd0ce20
Squashed 'src/' changes from 2dcf4062..b4a42445
...
b4a42445 Merge commit '1ebe8191c254ea7a50f20876ef1bf21450f7887a'
1ebe8191 Squashed 'phreeqcpp/' changes from 87919a0..7284fed
git-subtree-dir: src
git-subtree-split: b4a424453b03269c6af9be2fd5f0d7a7e63b5eb4
2024-04-17 00:17:30 +00:00
Darth Vader
a9dc9b84f8
Merge commit 'ccdbd0ce2040eb00006775fe0cf2ab2faf4138b5'
2024-04-17 00:17:30 +00:00
Darth Vader
80ab6f112d
Squashed 'phreeqc3-doc/' changes from f289b94c..e30aa466
...
e30aa466 merged master into viscosity
c86d4366 release.txt
git-subtree-dir: phreeqc3-doc
git-subtree-split: e30aa466d8b6ef81ec0543f481d885ee0bbe992f
2024-04-17 00:17:29 +00:00
Darth Vader
be441d7f80
Merge commit '80ab6f112d777072ba8708838991b3d00ee7bb2d'
2024-04-17 00:17:29 +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
6fb40a2b32
Merge commit '8e1a4d08360d4dbfa1505460fa5323ca24085528'
2024-04-05 17:14:37 +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
Darth Vader
894d25fb5a
Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
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
