Charlton, Scott R
|
c7dfbb5f60
|
added newlines for CRAN
|
2021-09-23 06:37:13 -07:00 |
|
Darth Vader
|
60ad724c7a
|
Merge commit 'e4bd9bafb40c82bff5ef275528ca3dd2836672e5'
|
2021-09-08 14:35:13 +00:00 |
|
Darth Vader
|
33f5157d8b
|
Merge commit '29f06d269c189449f230e15761d01381cfd51de2'
|
2021-08-31 13:52:37 +00:00 |
|
Darth Vader
|
ae41a1ffa6
|
Merge commit '09a2680a6ec98cfd9d59e5b40b1594edfd6b4eff'
|
2021-08-31 00:04:03 +00:00 |
|
Darth Vader
|
fd78a499d0
|
Merge commit '8d7c1fce37a929778a2c34ee19c29933529f46bc'
|
2021-08-27 16:05:15 +00:00 |
|
Charlton, Scott R
|
d19961bf85
|
Merge remote-tracking branch 'usgs-coupled/master'
|
2021-08-17 13:44:03 -06:00 |
|
Darth Vader
|
d4dfe590eb
|
Merge commit '07a864d1a6ed582ddfae5e1c3bf5b0620c3dd75c'
|
2021-08-17 15:35:22 +00:00 |
|
Darth Vader
|
afff58ffb0
|
Merge commit '48cb5e8969285f6d6e54955b6b7f8db76b2ec99f'
|
2021-06-24 18:31:49 +00:00 |
|
David Parkhurst
|
524bfc46cc
|
Finished up C, Fortran, documentation. Need to check DOxygen
|
2021-06-14 09:38:48 -06:00 |
|
David Parkhurst
|
26c71a359b
|
Merge remote-tracking branch 'origin/master' into state
|
2021-06-13 07:37:50 -06:00 |
|
David Parkhurst
|
c22cbb7bc7
|
Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C
|
2021-06-13 07:37:41 -06: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
|
5b7cf2f8f3
|
Merge commit '2212f9ccb1ed55b463746d524ace70e78258d5bc'
|
2021-05-10 22:50:17 +00:00 |
|
David Parkhurst
|
7a2f8916aa
|
made tally_table a vector of class tally
|
2021-04-26 23:38:21 -06:00 |
|
Darth Vader
|
aa62814aa6
|
Merge commit '58b0d1fccfc6763e569bee30f4ab5e4122963ede'
|
2021-04-23 20:14:47 +00:00 |
|
Darth Vader
|
2efc74230a
|
Merge commit '0feb71507f3a246e8021a2c4781ab6c814c73e71'
|
2021-04-22 21:37:59 +00:00 |
|
Darth Vader
|
4ae6494492
|
Merge commit '123cc8a5f5b095cfebea092a1e49a8872fc676d4'
|
2021-04-22 18:07:25 +00:00 |
|
Darth Vader
|
4a848dccec
|
Merge commit '22c4a624a98244cf2706842b9d989e0edc3b91e2'
|
2021-04-22 16:58:09 +00:00 |
|
Darth Vader
|
8080cbce1e
|
Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33'
|
2021-04-19 23:23:32 +00:00 |
|
Darth Vader
|
abacccd0ee
|
Merge commit '9661feab0a6da6876e32a18565ac4e79eaec2634'
|
2021-04-12 17:10:15 +00:00 |
|
Darth Vader
|
2537a2c376
|
Merge commit '4565c5d894d2a9f58577183783ba1969cbc680ea'
|
2021-04-11 23:25:37 +00:00 |
|
Darth Vader
|
4b9b99267b
|
Merge commit '6d2b45a8e168aa9e55ee677afe52367857e8140d'
|
2021-04-10 17:28:30 +00:00 |
|
Scott R Charlton
|
d77dff5739
|
removed TESTING definition
|
2021-04-08 11:24:03 -06:00 |
|
Darth Vader
|
2697dc958c
|
Merge commit 'e2ce92882c5f21ac206e180cf38812d976025717'
|
2021-04-08 15:12:06 +00:00 |
|
Darth Vader
|
0479fc1ada
|
Merge commit 'd2a5d63f30d0e3e2fddfeba7058caf8e8401de78'
|
2021-04-08 13:49:54 +00:00 |
|
Darth Vader
|
0aa30d21ac
|
Merge commit 'e3c0d61bc7acc87be515f9923da3a68e14e20880'
|
2021-04-07 19:26:20 +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 |
|
Darth Vader
|
de884e4e36
|
Merge commit '5161ea7563e7ed51be9ed623611762890c785858'
|
2021-03-20 03:56:07 +00:00 |
|
Charlton, Scott R
|
8e9c5b3592
|
only call qsort with more than one element
|
2021-03-19 17:32:10 -06:00 |
|
Darth Vader
|
c1c08f2f2d
|
Merge commit '1ab86414f0b25f986c14a55bdb967dfdef3af2ae'
|
2021-03-18 23:28:44 +00: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 |
|
Scott Charlton
|
d6e6d11b28
|
Merge pull request #2 from usgs-coupled/gasphasepressures
Fixed uninitialized constructors and couple of other warnings
|
2021-03-13 19:10:48 -07:00 |
|
Darth Vader
|
710d0096aa
|
Merge commit '6a5bb8aba56d568bd139bc3aed7363d929397790'
|
2021-03-12 16:57:10 +00:00 |
|
David Parkhurst
|
6b19edba79
|
Fixed uninitialized constructors and couple of other warnings
|
2021-03-12 07:50:01 -07:00 |
|
Darth Vader
|
62c51bb410
|
Merge commit '9e8b3828595be0339d3c63b5707412e34a4e5007'
|
2021-03-06 01:42:08 +00:00 |
|
Charlton, Scott R
|
b9f44da20a
|
Merge remote-tracking branch 'origin/master'
|
2021-03-05 16:43:46 -07:00 |
|
David Parkhurst
|
c4f9d291db
|
Merge branch 'log10molalities' into gasphasepressures
|
2021-03-02 20:58:44 -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
|
e1554d9987
|
more checking in. Should be down to tweaks for SetGasPhaseMoles.
|
2021-02-25 18:04:29 -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
|
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 |
|
Darth Vader
|
20ab4be9f3
|
Merge commit '3e4fc7ea18da750b2746422898dc100d74271b34'
|
2020-12-16 19:04:47 +00:00 |
|
Charlton, Scott R
|
33f589897a
|
[iphreeqccom] updated date
|
2020-12-02 20:02:35 -07:00 |
|
Darth Vader
|
e224625f08
|
Merge commit '711b1d061cba1005f028d1b17b0bb34e2b2d9162'
|
2020-12-03 01:53:17 +00:00 |
|