25 Commits

Author SHA1 Message Date
Darth Vader
a826eecc87 Merge commit '754ea3a9bc11cd1f7d350ff217bdb3dcd3af3d97' 2021-11-09 01:59:31 +00:00
Darth Vader
30169e617c Merge commit '3765e0cf266655280d362cdf5de35c25892959b6' 2021-10-31 19:41:44 +00:00
Darth Vader
9b94f8be88 Merge commit 'bea0ad10a02659d9964f6c88e0ca4e415a2c0aca' 2021-05-28 18:21:02 +00:00
Darth Vader
37de8fa93c Merge commit 'eaf788b473321914e188d3afd7ff0df1500665fb' 2021-05-12 13:54:31 +00:00
Darth Vader
aa62814aa6 Merge commit '58b0d1fccfc6763e569bee30f4ab5e4122963ede' 2021-04-23 20:14:47 +00:00
Darth Vader
8080cbce1e Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33' 2021-04-19 23:23:32 +00:00
Darth Vader
639490d061 Merge commit '2e5f255c794096790125293dcc3af274bed7a61a' 2021-04-07 14:27:20 +00:00
Darth Vader
b1efa4f251 Merge commit '7961b1686b4e064ec4ec886e76543074d060129f' 2021-04-06 16:04:54 +00:00
Darth Vader
4ca2e4e1f4 Merge commit '885a2f77289ac2738f6e8e02c8039f7e26ee7828' 2021-03-24 16:45:00 +00:00
Darth Vader
7b0c2df096 Merge commit '1986e00a933549022abb335d82f40c65abf2a292' 2021-03-22 23:37:01 +00:00
Charlton, Scott R
8e9c5b3592 only call qsort with more than one element 2021-03-19 17:32:10 -06:00
Darth Vader
3770354f0a Merge commit '67fc478a2f7873db5a2cf6306b433fa07fd58575' 2021-03-18 19:25:01 +00:00
Darth Vader
ecbb26c3d7 Merge commit 'ba9813a43c6d087851bf5c2ea86a658cc785060c' 2021-03-18 15:51:58 +00:00
Darth Vader
5688f83747 Merge commit '0feb20dead731b8dedf3e86d5ef664bc24733127' 2021-03-18 05:41:57 +00:00
David Parkhurst
18158db399 Last of changes for GetGasPhasePressures and GetGasPhasePhi, openmp and mpi. MPI fortrans not tested. 2021-02-27 22:26:48 -07:00
Darth Vader
6e7023f842 Merge commit 'fbae3e92947cf79c1d615e657192eb8d5c78b9e9' 2020-08-31 01:55:19 +00:00
Darth Vader
b138ed208d Merge commit '20daad41c8999670f933430f1c705384cdfa6947' 2020-08-20 02:37:16 +00:00
Darth Vader
5631ce1e56 Merge commit '801812ded3961b37ed264997211694bd0563d554' 2020-08-18 19:58:22 +00:00
Darth Vader
9d480bc124 Merge commit '2aef60aa6f00411ac4491e868c3cf2b6beab11ab' 2020-08-13 17:48:52 +00:00
Scott R Charlton
aa34ac1153 Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113' 2019-06-05 20:44:26 -06:00
Scott R Charlton
79c28e50c1 Merge commit '600c7ee5728aa23c963828df22b6e0c94038a3ed' 2019-05-06 15:44:18 -06:00
Scott R Charlton
7b836dd6cf Merge commit '9285985dc0222cf6fde33c32625027d376159b3b' 2018-08-22 16:44:20 -06:00
Scott R Charlton
b489442320 Merge commit '9592d6e8015707da5eb033f136590ba40015da61' 2018-08-06 14:29:22 -06:00
Scott R Charlton
311fa04fe1 Merge commit '53148278fc5456fddfcffc2d46aa7ccb7fff0ee9' 2018-08-01 18:27:17 -06:00
Scott Charlton
1d5c59a175 Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027'
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
2018-07-31 16:56:09 -06:00