3298 Commits

Author SHA1 Message Date
Darth Vader
74d30838b8 Merge commit '90f9cb53da2f41d8f186c8f01e651fac8b0a3ac6' 2021-03-13 23:23:03 +00:00
David Parkhurst
90f9cb53da checking in test cases using latest revisions. degree sign in pitzer.dat 2021-03-12 15:48:32 -07:00
Darth Vader
2ea83c27f5 Merge commit '710d0096aa62355bf6c212efb3f6f9392ccd3f37' 2021-03-12 16:57:53 +00:00
Darth Vader
710d0096aa Merge commit '6a5bb8aba56d568bd139bc3aed7363d929397790' 2021-03-12 16:57:10 +00:00
Darth Vader
70379b12a3 Merge commit 'd45a37e06fed138f9b563bf9a87a2e2e739fcf88' 2021-03-12 16:56:46 +00:00
Darth Vader
4c19cfb47a Merge commit '90ae41fc822e22fc566f25f40b96d4c2c609ebf2' 2021-03-12 16:56:43 +00:00
Scott Charlton
6a5bb8aba5 Merge pull request #1 from usgs-coupled/mar10
Merge mar10
2021-03-12 09:50:17 -07:00
David Parkhurst
90ae41fc82 tweaked RELEASE.TXT 2021-03-11 22:54:21 -07:00
David Parkhurst
d45a37e06f database UTF-8 2021-03-11 20:55:06 -07:00
David Parkhurst
c79d2c23c8 working on UTF-8 2021-03-11 19:52:49 -07:00
David Parkhurst
5228f81ec5 updated for Basic functions 2021-03-11 10:06:27 -07:00
David Parkhurst
fcee4d5da4 Added delta_h_species, delta_h_phase, dh_a0, dh_bdot Basic functions 2021-03-11 08:52:45 -07:00
David Parkhurst
81e862db5d Tonys changes Mar 10. SIs in inverse calulations 2021-03-10 14:08:03 -07:00
David Parkhurst
3aa7a14698 Tony database update, kinetic_rates example 2021-03-10 11:34:26 -07:00
David Parkhurst
f385cf576e Tony's updates March 10, 2021 2021-03-10 10:07:19 -07:00
David Parkhurst
88afb6607d Tony's changes March 10, 2021. 2021-03-10 09:50:49 -07:00
Darth Vader
606942c6ed Merge commit '62c51bb410b3f9fd18cc5a21b5341e9652089d86' 2021-03-06 01:42:53 +00:00
Darth Vader
62c51bb410 Merge commit '9e8b3828595be0339d3c63b5707412e34a4e5007' 2021-03-06 01:42:08 +00:00
Darth Vader
cd1bb2abc2 Merge commit '4396def4a316930fcb2ada35897314354f24c1af' 2021-03-06 01:41:10 +00:00
Darth Vader
9a974e99f3 Merge commit '0087a2c735332605d07fb93570ad545d9b323493' 2021-03-06 01:41:08 +00:00
Charlton, Scott R
9e8b382859 Merge remote-tracking branch 'usgs-coupled/master' 2021-03-05 18:38:44 -07:00
Darth Vader
0273734d97 Merge commit '4473286a216928665f9c1b00932687c9945175a9' 2021-03-05 23:51:16 +00:00
Darth Vader
4473286a21 Merge commit '053b4c6fb3cb778f08377b932745643472888aa5' 2021-03-05 23:50:16 +00:00
Darth Vader
996c35291b Merge commit 'b9f44da20a78a23395d38205c001298f6a68bd0c' 2021-03-05 23:49:46 +00:00
Charlton, Scott R
053b4c6fb3 Merge remote-tracking branch 'origin/master' 2021-03-05 16:43:46 -07:00
Charlton, Scott R
b9f44da20a Merge remote-tracking branch 'origin/master' 2021-03-05 16:43:46 -07:00
David Parkhurst
0087a2c735 New PhreeqcRM methods 2021-03-03 17:52:58 -07:00
David Parkhurst
20091aa52d Merge branch 'log10molalities' into gasphasepressures 2021-03-02 20:58:44 -07:00
David Parkhurst
c4f9d291db Merge branch 'log10molalities' into gasphasepressures 2021-03-02 20:58:44 -07:00
David Parkhurst
41e1112fb9 Last of changes for GetGasPhasePressures and GetGasPhasePhi, openmp and mpi. MPI fortrans not tested. 2021-02-27 22:26:48 -07: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
David Parkhurst
e1f9cb1cc5 more checking in. Should be down to tweaks for SetGasPhaseMoles. 2021-02-25 18:04:29 -07:00
David Parkhurst
e1554d9987 more checking in. Should be down to tweaks for SetGasPhaseMoles. 2021-02-25 18:04:29 -07:00
David Parkhurst
00ee6e365a C++ is working with OpenMP and MPI for Get/SetGasPhaseMoles. Need to add c and F90. 2021-02-23 10:56:26 -07:00
David Parkhurst
0a63328909 C++ is working with OpenMP and MPI for Get/SetGasPhaseMoles. Need to add c and F90. 2021-02-23 10:56:26 -07:00
David Parkhurst
cf68cd89b8 Updated RELEASE.TXT, sys_sort 2021-02-21 21:17:08 -07:00
David Parkhurst
c3a3153f9b Added GetSpeciesLog10Molalities. Tested OpenMP with VS. Tested MPI with MinGW. Fortran, C, and C++ seem to work. 2021-02-21 21:13:05 -07:00
David Parkhurst
566bfbce3b Added GetSpeciesLog10Molalities. Tested OpenMP with VS. Tested MPI with MinGW. Fortran, C, and C++ seem to work. 2021-02-21 21:13:05 -07:00
David Parkhurst
e8b11f3472 added optional 6th argument to Basic function sys to change sort order from molality or moles to the name. Added synonym PAD$. Added new mytest/sys_sort. 2021-02-20 20:53:29 -07:00
David Parkhurst
6512551f95 added optional 6th argument to Basic function sys to change sort order from molality or moles to the name. Added synonym PAD$. Added new mytest/sys_sort. 2021-02-20 20:53:29 -07:00
David Parkhurst
4396def4a3 add databases 2021-02-07 12:16:23 -07:00
Darth Vader
7703ac4b71 Merge commit '20ab4be9f3235740e6ed5ede81bca488adffd991' 2020-12-16 19:05:29 +00:00
Darth Vader
20ab4be9f3 Merge commit '3e4fc7ea18da750b2746422898dc100d74271b34' 2020-12-16 19:04:47 +00:00
David Parkhurst
3e4fc7ea18 cleanup commented lines 2020-12-09 10:49:13 -07:00
David Parkhurst
54b992f566 working on tabs and no newline 2020-12-08 20:38:18 -07:00
David Parkhurst
2181847329 Merge branch 'master' of https://github.com/usgs-coupled/phreeqc3 2020-12-07 15:25:58 -07:00
David Parkhurst
deeecb0c43 needed strexpr in ADD_HEADING to allow expressions 2020-12-07 15:24:11 -07:00
Darth Vader
11f8f82735 Merge commit '49d67912c15c916daa47feed5ab679f139a66abb' 2020-12-03 03:28:51 +00:00
Charlton, Scott R
ab6bae23a2 [webmod] updated date 2020-12-02 20:26:08 -07:00
Charlton, Scott R
49d67912c1 [webmod] updated date 2020-12-02 20:26:08 -07:00